diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 415678154f..47c5fe3036 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -345,6 +345,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$x++;
 		}
 		echo "		</select>\n";
+	}
+	elseif ($category == "email" && $subcategory == "smtp_password" && $name == "var" ) {
+		echo "	<input class='formfld' type='password' name='default_setting_value' maxlength='255' value=\"".$row['default_setting_value']."\">\n";
+	}
+	elseif ($category == "provision" && $subcategory == "password" && $name == "var" ) {
+		echo "	<input class='formfld' type='password' name='default_setting_value' maxlength='255' value=\"".$row['default_setting_value']."\">\n";
 	} else {
 		echo "	<input class='formfld' type='text' name='default_setting_value' maxlength='255' value=\"".$row['default_setting_value']."\">\n";
 	}
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 752234356b..14772f5110 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -144,9 +144,15 @@ require_once "includes/paging.php";
 				foreach ($sub_result as &$sub_row) {
 					echo $sub_row["menu_language"]." - ".$sub_row["menu_name"]."\n";
 				}
+			}
+			elseif ($category == "email" && $subcategory == "smtp_password" && $name == "var" ) {
+				echo "		******** &nbsp;\n";
+			}
+			elseif ($category == "provision" && $subcategory == "password" && $name == "var" ) {
+				echo "		******** &nbsp;\n";
 			} else {
-				echo 		$row['default_setting_value'];
-			}	
+				echo "		".$row['default_setting_value'];
+			}
 			echo "		&nbsp;\n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['default_setting_enabled']."&nbsp;</td>\n";
diff --git a/core/domains/domain_settings.php b/core/domains/domain_settings.php
index 89de4cbc10..8412317ab9 100644
--- a/core/domains/domain_settings.php
+++ b/core/domains/domain_settings.php
@@ -145,9 +145,15 @@ require_once "includes/paging.php";
 				foreach ($sub_result as &$sub_row) {
 					echo $sub_row["menu_language"]." - ".$sub_row["menu_name"]."\n";
 				}
+			}
+			elseif ($category == "email" && $subcategory == "smtp_password" && $name == "var" ) {
+				echo "		******** &nbsp;\n";
+			}
+			elseif ($category == "provision" && $subcategory == "password" && $name == "var" ) {
+				echo "		******** &nbsp;\n";
 			} else {
 				echo 		$row['domain_setting_value'];
-			}	
+			}
 			echo "		&nbsp;\n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['domain_setting_enabled']."&nbsp;</td>\n";
diff --git a/core/domains/domain_settings_edit.php b/core/domains/domain_settings_edit.php
index d6c43881bf..3fec070a0a 100644
--- a/core/domains/domain_settings_edit.php
+++ b/core/domains/domain_settings_edit.php
@@ -303,6 +303,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			}
 			echo "		</select>\n";
 			break;
+	}
+	elseif ($category == "email" && $subcategory == "smtp_password" && $name == "var" ) {
+		echo "	<input class='formfld' type='password' name='default_setting_value' maxlength='255' value=\"".$row['default_setting_value']."\">\n";
+	}
+	elseif ($category == "provision" && $subcategory == "password" && $name == "var" ) {
+		echo "	<input class='formfld' type='password' name='default_setting_value' maxlength='255' value=\"".$row['default_setting_value']."\">\n";
 	} else {
 			echo "	<input class='formfld' type='text' name='domain_setting_value' maxlength='255' value=\"$domain_setting_value\">\n";
 	}