diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index afbcb8638e..7093f96a22 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -403,10 +403,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		}
 		echo "		</select>\n";
 	}
-	elseif ($category == "email" && $subcategory == "smtp_password" && $name == "var" ) {
-		echo "	<input class='formfld' type='password' name='default_setting_value' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" maxlength='255' value=\"".$default_setting_value."\">\n";
-	}
-	elseif ($category == "provision" && $subcategory == "password" && $name == "var" ) {
+	elseif (substr_count(strtolower($subcategory), '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 		echo "	<input class='formfld' type='password' name='default_setting_value' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" maxlength='255' value=\"".$default_setting_value."\">\n";
 	}
 	elseif (
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index ad71c96770..93b5ce9317 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -395,15 +395,8 @@ else {
 			else if ($category == "domain" && $subcategory == "template" && $name == "name" ) {
 				echo "		".ucwords($row['default_setting_value']);
 			}
-			else if ($category == "email" && $subcategory == "smtp_password" && $name == "var" ) {
-				echo "		";
-				for ($d = 1; $d <= strlen($row['default_setting_value']); $d++) { echo "*"; }
-				echo "&nbsp;\n";
-			}
-			else if ($category == "provision" && $subcategory == "password" && $name == "var" ) {
-				echo "		";
-				for ($d = 1; $d <= strlen($row['default_setting_value']); $d++) { echo "*"; }
-				echo "&nbsp;\n";
+			else if (substr_count(strtolower($subcategory), '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
+				echo "		".str_repeat('*', strlen($row['default_setting_value']));
 			}
 			else {
 				echo "		".htmlspecialchars($row['default_setting_value']);