diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index c3981e095f..0d556a6d44 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -901,7 +901,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "	".$text['label-email_connection_password']."\n";
 			echo "</td>\n";
 			echo "<td class='vtable' align='left'>\n";
-			echo "	<input class='formfld' type='text' name='fax_email_connection_password' maxlength='255' value=\"$fax_email_connection_password\">\n";
+			echo "	<input class='formfld' type='password' name='fax_email_connection_password' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" autocomplete='off' maxlength='50' value=\"$fax_email_connection_password\">\n";
 			echo "<br />\n";
 			echo "	".$text['description-email_connection_password']."\n";
 			echo "</td>\n";