diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp
index a3a75b299b..9f6f7f9ae7 100755
--- a/channels/h323/ast_h323.cpp
+++ b/channels/h323/ast_h323.cpp
@@ -5,8 +5,8 @@
  *			By  Jeremy McNamara
  *			For The NuFone Network
  * 
- * This code has been derived from code created by 
- *		Michael Manousos and Mark Spencer
+ * This code has been derived from code created by
+ *              Michael Manousos and Mark Spencer
  *
  * This file is part of the chan_h323 driver for Asterisk
  *
diff --git a/channels/h323/ast_h323.h b/channels/h323/ast_h323.h
index 468f778155..492802955b 100755
--- a/channels/h323/ast_h323.h
+++ b/channels/h323/ast_h323.h
@@ -5,8 +5,8 @@
  *			By Jeremy McNamara
  *                      For The NuFone Network 
  * 
- * This code has been derived from code created by 
- *		Michael Manousos and Mark Spencer
+ * This code has been derived from code created by
+ *              Michael Manousos and Mark Spencer
  *
  * This file is part of the chan_h323 driver for Asterisk
  *
diff --git a/channels/h323/chan_h323.c b/channels/h323/chan_h323.c
index 99bfede494..9ad2d48b84 100755
--- a/channels/h323/chan_h323.c
+++ b/channels/h323/chan_h323.c
@@ -5,8 +5,8 @@
  *			By Jeremy McNamara
  *                      For The NuFone Network 
  *
- * This code has been derived from code created by 
- *		Michael Manousos and Mark Spencer
+ * This code has been derived from code created by
+ *              Michael Manousos and Mark Spencer
  *
  * This file is part of the chan_h323 driver for Asterisk
  *
@@ -239,6 +239,8 @@ static struct oh323_user *build_user(char *name, struct ast_variable *v)
 				user->noSilenceSuppression = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "secret")) {
 				strncpy(user->secret, v->value, sizeof(user->secret)-1);
+			} else if (!strcasecmp(v->name, "callerid")) {
+				strncpy(user->callerid, v->value, sizeof(user->callerid)-1);
 			} else if (!strcasecmp(v->name, "accountcode")) {
 				strncpy(user->accountcode, v->value, sizeof(user->accountcode)-1);
 			} else if (!strcasecmp(v->name, "incominglimit")) {