diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index e3235a5d00..20c961c758 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -226,7 +226,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	".$text['label-voicemail_id'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "  <input class='formfld' type='text' name='voicemail_id' maxlength='255' value='$voicemail_id'>\n";
+	echo "	<input class='formfld' type='text' name='voicemail_id' maxlength='255' value='$voicemail_id'>\n";
 	echo "<br />\n";
 	echo $text['description-voicemail_id']."\n";
 	echo "</td>\n";
@@ -237,9 +237,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	".$text['label-voicemail_password'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='voicemail_password' maxlength='255' value=\"$voicemail_password\">\n";
+	echo "	<input class='formfld' type='password' name='voicemail_password' id='password' onfocus=\"document.getElementById('show_password').innerHTML = '".$text['label-voicemail_password'].": '+document.getElementById('password').value;\" autocomplete='off' maxlength='50' value=\"$voicemail_password\">\n";
 	echo "<br />\n";
-	echo $text['description-voicemail_password']."\n";
+	echo $text['description-voicemail_password']." <span id='show_password'></span>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
@@ -248,7 +248,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	".$text['label-greeting_id'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "  <input class='formfld' type='text' name='greeting_id' maxlength='255' value='$greeting_id'>\n";
+	echo "	<input class='formfld' type='text' name='greeting_id' maxlength='255' value='$greeting_id'>\n";
 	echo "<br />\n";
 	echo $text['description-greeting_id']."\n";
 	echo "</td>\n";