diff --git a/templates/password.tpl b/templates/password.tpl
index c645e1aa..64f660e2 100644
--- a/templates/password.tpl
+++ b/templates/password.tpl
@@ -1,5 +1,5 @@
 <div id="edit_form">
-<form name="mailbox" method="post" action="">
+<form name="password" method="post" action="">
 <table>
 	<tr>
 		<th colspan="3">{$PALANG.pPassword_welcome}</th>
@@ -26,7 +26,11 @@
 	</tr>
 	<tr>
 		<td class="label">&nbsp;</td>
-		<td><input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" /></td>
+		<td>
+			<input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" /></td>
+			{if $authentication_has_role.user}
+				<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
+			{/if}
 		<td>&nbsp;</td>
 	</tr>
 </table>
diff --git a/templates/users_password.tpl b/templates/users_password.tpl
deleted file mode 100644
index da907d05..00000000
--- a/templates/users_password.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="edit_form">
-<form name="alias" method="post" action="">
-<table>
-	<tr>
-		<th colspan="3">{$PALANG.pPassword_welcome}</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_admin}:</label></td>
-		<td><em>{$USERID_USERNAME}</em></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_password_current}:</label></td>
-		<td><input class="flat" type="password" name="fPassword_current" /></td>
-		<td class="error_msg">{$pPassword_password_current_text}</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_password}:</label></td>
-		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td class="error_msg">{$pPassword_password_text}</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pPassword_password2}:</label></td>
-		<td><input class="flat" type="password" name="fPassword2" /></td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td>
-		<input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" />
-		<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-</form>
-</div>
diff --git a/users/password.php b/users/password.php
index 9cfe9362..9829dd8d 100644
--- a/users/password.php
+++ b/users/password.php
@@ -14,7 +14,7 @@
  * 
  * File: password.php
  * Used by users to change their mailbox (and login) password.
- * Template File: users_password.php
+ * Template File: password.tpl
  *
  * Template Variables:
  *
@@ -76,11 +76,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
     }
 }
 
-$smarty->assign ('USERID_USERNAME', $username);
+$smarty->assign ('SESSID_USERNAME', $username);
 $smarty->assign ('pPassword_password_current_text', $pPassword_password_current_text, false);
 $smarty->assign ('pPassword_password_text', $pPassword_password_text, false);
 
-$smarty->assign ('smarty_template', 'users_password');
+$smarty->assign ('smarty_template', 'password');
 $smarty->display ('index.tpl');
 
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */