diff --git a/components/editorControls/SettingControls/Password.cs b/components/editorControls/SettingControls/Password.cs
index 1142315df3..d153b13611 100644
--- a/components/editorControls/SettingControls/Password.cs
+++ b/components/editorControls/SettingControls/Password.cs
@@ -31,6 +31,10 @@ namespace umbraco.editorControls.SettingControls
 
             tb.TextMode = TextBoxMode.Password;
             tb.CssClass = "guiInputText guiInputStandardSize";
+
+            if (string.IsNullOrEmpty(tb.Text) && !string.IsNullOrEmpty(DefaultValue))
+                tb.Text = DefaultValue;
+
             return tb;
         }
     }