diff --git a/web/html/account.php b/web/html/account.php
index f15a10a1..50d376f7 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -105,8 +105,8 @@ if (isset($_COOKIE["AURSID"])) {
 		#
 		process_account_form("","new", "NewAccount",
 				in_request("U"), 1, 0, in_request("E"),
-				in_request("P"), in_request("C"), in_request("R"),
-				in_request("L"), in_request("I"), in_request("K"));
+				'', '', in_request("R"), in_request("L"),
+				in_request("I"), in_request("K"));
 
 	} else {
 		# display the account request form
diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php
index a41b34cf..a0de2a38 100644
--- a/web/template/account_edit_form.php
+++ b/web/template/account_edit_form.php
@@ -60,17 +60,17 @@
 			<input type="text" size="30" maxlength="64" name="E" id="id_email" value="<?= htmlspecialchars($E,ENT_QUOTES) ?>" /> (<?= __("required") ?>)
 		</p>
 
+		<?php if ($A == "UpdateAccount"): ?>
 		<p>
 			<label for="id_passwd1"><?= __("Password") ?>:</label>
 			<input type="password" size="30" name="P" id="id_passwd1" value="<?= $P ?>" />
-			<?php if ($A != "UpdateAccount"): print " (".__("required").")"; endif; ?>
 		</p>
 
 		<p>
 			<label for="id_passwd2"><?= __("Re-type password") ?>:</label>
 			<input type="password" size="30" name="C" id="id_passwd2" value="<?= $C ?>" />
-			<?php if ($A != "UpdateAccount"): print " (".__("required").")"; endif; ?>
 		</p>
+		<?php endif; ?>
 
 		<p>
 			<label for="id_realname"><?= __("Real Name") ?>:</label>