diff --git a/user_account.php b/user_account.php
index a26a503..3a66e27 100644
--- a/user_account.php
+++ b/user_account.php
@@ -201,29 +201,42 @@ case 'save':
 <tr>
 	<td style="text-align: left" colspan="2"><b>Username</b><hr /></td>
 </tr><tr>
-	<td><?=i18n('Username')?>:</td>
-	<td>	<input <?=$ud?> <?=$d?> id="username" name=username type="text" size="20" value="<?=$a['username']?>"><br />
+		<td><?=i18n('Username')?>:</td>
+		<td>	<input <?=$ud?> <?=$d?> id="username" name=username type="text" size="20" value="<?=$a['username']?>"><br />
 		<input id="username_link" <?=$username_link?> <?=$d?> type="checkbox" name="username_link" value="yes" />
 			<?=i18n('Use the email address as the login username')?><br />
 		
-	</td>
-</tr><tr>
-	<td colspan="2">
-	<br />
-	</td>
-</tr><tr>
-	<td style="text-align: left" colspan="2"><b>Password</b><hr /></td>
-</tr><tr>
-	<td><label for="pass1"><?=i18n('New Password')?>:</label></td>
-	<td><input id="pass1" name="pass1" type="password" size="20" value=""></td>
- </tr><tr>
-	<td><label for="pass2"><?=i18n('Confirm New Password')?>:</label></td>
-	<td><input id="pass2" name="pass2" type="password" size="20" value=""></td>
- </tr><tr>
-	<td></td><td>
-	<div style="font-size: 0.75em;"><?=i18n('Passwords must be be between 6 and 32 characters, and may NOT contain any quote or a backslash.')?></div>
-	</td>
- </tr></table>
+		</td>
+	</tr>
+	<tr><td colspan="2"><br /></td></tr>
+	<tr>
+		<td style="text-align: left" colspan="2"><b>Password</b><hr /></td>
+	</tr>
+	<?
+	if($_SESSION['superuser']=="yes") {
+	?>
+	<tr>
+		<td><label for="pass1"><?=i18n('Current Password')?>:</label></td>
+		<td><? echo account_get_password($a['id']); ?></td>
+	</tr>
+	<?
+	}
+	?>
+	<tr>
+		<td><label for="pass1"><?=i18n('New Password')?>:</label></td>
+		<td><input id="pass1" name="pass1" type="password" size="20" value=""></td>
+	</tr>
+	<tr>
+		<td><label for="pass2"><?=i18n('Confirm New Password')?>:</label></td>
+		<td><input id="pass2" name="pass2" type="password" size="20" value=""></td>
+	</tr>
+ 	<tr>
+		<td></td>
+		<td>
+			<div style="font-size: 0.75em;"><?=i18n('Passwords must be be between 6 and 32 characters, and may NOT contain any quote or a backslash.')?></div>
+		</td>
+ 	</tr>
+	</table>
  <br />
  <br />
  <input type="submit" value="<?=i18n("Save")?>" />