diff --git a/create-admin.php b/create-admin.php
index 4d04eaf9..7343a6ea 100644
--- a/create-admin.php
+++ b/create-admin.php
@@ -19,7 +19,6 @@
  *
  * Template Variables:
  *
- * tMessage
  * tUsername
  * tDomains
  *
@@ -36,10 +35,11 @@ require_once('common.php');
 authentication_require_role('global-admin');
 $list_domains = list_domains ();
 $tDomains = array();
+$pAdminCreate_admin_username_text_error = "";
+$pAdminCreate_admin_password_text_error = "";
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
-   $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
    $tDomains = array ();
 }
 
@@ -50,18 +50,22 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
    if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
    $fDomains = array();
    if (!empty ($_POST['fDomains'])) $fDomains = $_POST['fDomains'];
-   list ($error, $tMessage, $pAdminCreate_admin_username_text, $pAdminCreate_admin_password_text) = create_admin($fUsername, $fPassword, $fPassword2, $fDomains);
+   list ($error, $infoMessage, $pAdminCreate_admin_username_text_error, $pAdminCreate_admin_password_text_error) = create_admin($fUsername, $fPassword, $fPassword2, $fDomains);
 
    if ($error != 0) {
       if (isset ($_POST['fUsername'])) $tUsername = escape_string ($_POST['fUsername']);
       if (isset ($_POST['fDomains'])) $tDomains = $_POST['fDomains'];
    }
+   
+   if(!empty($infoMessage))
+	flash_info($infoMessage);
+   
 }
 
 $smarty->assign ('tUsername', $tUsername);
-$smarty->assign ('pAdminCreate_admin_username_text', $pAdminCreate_admin_username_text, false);
-$smarty->assign ('pAdminCreate_admin_password_text', $pAdminCreate_admin_password_text, false);
-$smarty->assign ('tMessage', $tMessage, false);
+$smarty->assign ('pAdminCreate_admin_username_text', $PALANG['pAdminCreate_admin_username_text'], false);
+$smarty->assign ('pAdminCreate_admin_username_text_error', $pAdminCreate_admin_username_text_error, false);
+$smarty->assign ('pAdminCreate_admin_password_text_error', $pAdminCreate_admin_password_text_error, false);
 $smarty->assign ('select_options', select_options ($list_domains, $tDomains), false);
 
 $smarty->assign ('smarty_template', 'admin_create-admin');
diff --git a/templates/admin_create-admin.tpl b/templates/admin_create-admin.tpl
index ca96151d..5a2080c0 100644
--- a/templates/admin_create-admin.tpl
+++ b/templates/admin_create-admin.tpl
@@ -2,35 +2,36 @@
 <form name="create_admin" method="post" action="">
 <table>
 	<tr>
-		<td colspan="3"><h3>{$PALANG.pAdminCreate_admin_welcome}</h3></td>
+		<th colspan="4">{$PALANG.pAdminCreate_admin_welcome}</th>
 	</tr>
 	<tr>
-		<td>{$PALANG.pAdminCreate_admin_username}:</td>
+		<td class="label"><label>{$PALANG.pAdminCreate_admin_username}:</label></td>
 		<td><input class="flat" type="text" name="fUsername" value="{$tUsername}" /></td>
 		<td>{$pAdminCreate_admin_username_text}</td>
+		<td><span class="error_msg">{$pAdminCreate_admin_username_text_error}</span></td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pAdminCreate_admin_password}:</td>
+		<td class="label"><label>{$PALANG.pAdminCreate_admin_password}:</label></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td>{$pAdminCreate_admin_password_text}</td>
+		<td>&nbsp;</td>
+		<td><span class="error_msg">{$pAdminCreate_admin_password_text_error}</span></td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pAdminCreate_admin_password2}:</td>
+		<td class="label"><label>{$PALANG.pAdminCreate_admin_password2}:</label></td>
 		<td><input class="flat" type="password" name="fPassword2" /></td>
-
+		<td colspan="2">&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pAdminCreate_admin_address}:</td>
+		<td class="label"><label>{$PALANG.pAdminCreate_admin_address}:</label></td>
 		<td>
 			<select name="fDomains[]" size="10" multiple="multiple">{$select_options}</select>
 		</td>
-
+		<td colspan="2">&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_admin_button}" /></td>
-	</tr>
-	<tr>
-		<td colspan="3" class="standout">{$tMessage}</td>
+		<td>&nbsp;</td>
+		<td><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_admin_button}" /></td>
+		<td colspan="2">&nbsp;</td>
 	</tr>
 </table>
 </form>
diff --git a/variables.inc.php b/variables.inc.php
index 19ec190a..068bb220 100644
--- a/variables.inc.php
+++ b/variables.inc.php
@@ -77,8 +77,6 @@ $tSubject = "";
 $tUsername = "";
 $tTransport = "";
 
-$pAdminCreate_admin_password_text = "&nbsp;";
-$pAdminCreate_admin_username_text = "&nbsp;";
 $pAdminCreate_domain_defaultaliases_text = "&nbsp;";
 $pAdminCreate_domain_domain_text = "&nbsp;";
 $pCreate_alias_address_text = "&nbsp;";