diff --git a/AUTHORS b/AUTHORS
index 050743f1fc6..02294354952 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,90 +1,90 @@
-# $Id$
+#
 # The format of this file was inspired by the Linux kernel CREDITS file.
-# 
+#
 # Authors and contributors are listed alphabetically (first name).
 #
-# The fields are: name (N), email (E), web-address (W), SVN account login (C),
+# The fields are: name (N), email (E), web-address (W), username (U),
 # PGP key ID and fingerprint (P) and description (D).
 
 
-    ACTIVE PEOPLES
+    ACTIVE PEOPLE
 ======================
 
 N: Alexandr Dubovikov
-C: adubovikov
+U: adubovikov
 E: voip@start4.info
 D: Modules Contributor to OpenSIPS
 
 
 N: Bogdan Andrei Iancu
-C: bogdan-iancu
+U: bogdan-iancu
 E: bogdan@opensips.org
 W: http://www.opensips.org
 D: Core developer of SER / OpenSER / OpenSIPS
 
 
 N: Di-Shi Sun
-C: di-shi
+U: di-shi
 E: di-shi@transnexus.com
 D: Modules Contributor to OpenSIPS
 
 
 N: Ionel Cerghit
-C: ionel-cerghit
+U: ionel-cerghit
 E: ionel.cerghit@gmail.com
 D: Contributor to OpenSIPS
 
 
 N: Ionut-Razvan Ionita
-C: ionutrazvanionita
+U: ionutrazvanionita
 E: ionutionita@opensips.org
 D: Contributor to OpenSIPS
 
 
 N: Liviu Chircu
-C: liviuchircu
+U: liviuchircu
 E: liviu@opensips.org
 D: Core Developer of OpenSIPS
 
 
 N: Maxim Sobolev
-C: sobomax
+U: sobomax
 E: sobomax@sippysoft.com
 D: Contributor to OpenSIPS
 
 
 N: Norman Brandinger
-C: goestelecom
+U: goestelecom
 E: norm@goes.com
 D: Contributor to OpenSIPS
 
 
 N: Ovidiu Sas
-C: osas
+U: osas
 E: osas@voipembedded.com
 D: Contributor to OpenSIPS
 
 
 N: Saúl Ibarra Corretgé
-C: saghul
+U: saghul
 E: saghul@gmail.com
 D: Contributor to OpenSIPS
 
 
 N: Razvan Crainea
-C: razvancrainea
+U: razvancrainea
 E: razvancrainea@opensips.org
 D: Core Developer of OpenSIPS
 
 
 N: Robert Vladut Patrascu
-C: rvlad-patrascu
+U: rvlad-patrascu
 E: rvlad.patrascu@gmail.com
 D: Contributor to OpenSIPS
 
 
 N: Vladut Paiu
-C: vladut-paiu
+U: vladut-paiu
 E: vladpaiu@opensips.org
 D: Core Developer of OpenSIPS
 
@@ -94,25 +94,25 @@ D: Core Developer of OpenSIPS
 ==========================
 
 N: Anca Vamanu
-C: anca_vamanu
+U: anca_vamanu
 E: anca@opensips.org
 D: Main developer of OpenSIPS
 
 
 N: Andrei Dragus
-C: andreidragus
+U: andreidragus
 E: andreidragus@yahoo.com
 D: Contributor to OpenSIPS
 
 
 N: Andrei Pisau
-C: apisau
+U: apisau
 E: andrei.pisau@opensips.org
 D: Contributor to OpenSIPS
 
 
 N: Andreas Granig
-C: agranig
+U: agranig
 E: andreas.granig@inode.info
 D: Contributor to OpenSER
 
@@ -124,43 +124,43 @@ D: Core developer of SER
 
 
 N: Arnaud Chong
-C: achamo
+U: achamo
 D: Modules Contributor to OpenSIPS
 
 
 N: Bastian Friedrich
-C: bastian
+U: bastian
 E: bastian.friedrich@collax.com
 D: Contributor to OpenSER
 
 
 N: Daniel-Constantin Mierla
-C: miconda
+U: miconda
 E: daniel@opensips.org
 W: http://www.opensips.org
 D: Core developer of SER / OpenSER
 
 
 N: Dan Pascu
-C: dan_pascu
+U: dan_pascu
 E: dan@ag-projects.com
 D: Main developer of OpenSIPS
 
 
 N: Denis Bilenko
-C: denik
+U: denik
 E: denis@ag-projects.com
 D: Contributor to OpenSIPS
 
 
 N: Dmitry Isakbayev
-C: isakdim
+U: isakdim
 E: isakdim@gmail.com
 D: Contributor to OpenSIPS
 
 
 N: Elias Baixas
-C: eliasbaixas
+U: eliasbaixas
 E: elias.baixas@voztele.com
 D: Contributor to OpenSIPS
 
@@ -174,25 +174,25 @@ D: Contributor to SER
 
 
 N: Henning Westerholt
-C: henningw
+U: henningw
 E: henning.westerholt@1und1.de
 D: Contributor to OpenSER
 
 
 N: Iñaki Baz Castillo
-C: ibc_sf
+U: ibc_sf
 E: ibc@aliax.net
 D: Contributor to OpenSIPS
 
 
 N: Irina-Maria Stanescu
-C: ironmissy
+U: ironmissy
 E: ironmissy@gmail.com
 D: Contributor to OpenSIPS
 
 
 N: Iulia Bublea
-C: iulia_bublea
+U: iulia_bublea
 E: iulia@opensips.org
 D: Contributor to OpenSIPS
 
@@ -209,13 +209,13 @@ D: Contributor to SER
 
 
 N: Jeffrey Magder
-C: jmagder
+U: jmagder
 E: jmagder@somanetworks.com
 D: Contributor to OpenSIPS
 
 
 N: Jesus Rodrigues
-C: jerocu
+U: jerocu
 E: jesusr@voztele.com
 W: www.voztele.com
 D: Contributor to OpenSIPS
@@ -226,33 +226,33 @@ D: Main developer of SER
 
 
 N: Juha Heinanen
-C: juhe
+U: juhe
 E: jh@tutpro.com
 W: http://lohi.eng.song.fi
 D: Contributor to OpenSER
 
 
 N: Klaus Darilion
-C: klaus_darilion
+U: klaus_darilion
 E: klaus.mailinglists@pernau.at
 W: http://www.enum.at/
 D: Contributor to OpenSER
 
 
 N: Kobi Eshun
-C: ekobi
+U: ekobi
 E: kobi@sightspeed.com
 D: Contributer to OpenSIPS
 
 
 N: Lavinia Andrei Spirea
-C: lavinia_andreea
+U: lavinia_andreea
 E: lavinia@opensips.org
 D: Contributor to OpenSER
 
 
 N: Luci Stanescu
-C: luci_stanescu
+U: luci_stanescu
 E: luci@ag-projects.com
 D: Contributer to OpenSIPS
 
@@ -274,13 +274,13 @@ D: Contributor to SER
 
 
 N: Peter Nixon
-C: peternixon
+U: peternixon
 E: peter@peternixon.net
 D: Packager for OpenSIPS
 
 
 N: Ramona-Elena Modroiu
-C: ramona
+U: ramona
 E: ramona@opensips.org
 W: http://www.opensips.org
 D: Main developer of SER / OpenSER
@@ -292,19 +292,19 @@ D: Minor contributor to SER
 
 
 N: Razvan Pistolea
-C: rpistolea
+U: rpistolea
 E: razvy000@yahoo.com
 D: Packager for OpenSIPS
 
 
 N: Ron Winacott
-C: karwin
+U: karwin
 E: ronw@somanetworks.com
 D: Contributor to OpenSIPS
 
 
 N: Sergio Gutierrez
-C: saguti
+U: saguti
 E: saguti@gmail.com
 D: Contributor to OpenSIPS