diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
index c224d04fae..c6c9bb115f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
@@ -20,29 +20,32 @@
 
             <!-- we need to show the old pass field when the provider cannot retrieve the password -->
             <umb-control-group alias="oldPassword" label="Old password" ng-show="$parent.showOldPass()">            
-                <input type="text" name="oldPassword" ng-model="$parent.model.value.oldPassword"
+                <input type="password" name="oldPassword" ng-model="$parent.model.value.oldPassword"
                        class="input-large umb-textstring textstring" 
                        ng-required="$parent.showOldPass()"
-                       val-server="oldPassword" no-dirty-check/>    
+                       val-server="oldPassword" no-dirty-check
+                       autocomplete="off"/>    
                 <span class="help-inline" val-msg-for="oldPassword" val-toggle-msg="required">Required</span>
                 <span class="help-inline" val-msg-for="oldPassword" val-toggle-msg="valServer"></span>
             </umb-control-group>
 
             <umb-control-group alias="password" label="New password" ng-show="$parent.showNewPass()">            
-                <input type="text" name="password" ng-model="$parent.model.value.newPassword"
-                       class="input-large umb-textstring textstring" 
+                <input type="password" name="password" ng-model="$parent.model.value.newPassword"
+                       class="input-large umb-textstring textstring"
                        ng-required="!$parent.model.value.reset"
-                       val-server="value" 
-                       ng-minlength="{{$parent.model.config.minPasswordLength}}" no-dirty-check/>    
+                       val-server="value"
+                       ng-minlength="{{$parent.model.config.minPasswordLength}}" no-dirty-check
+                       autocomplete="off" />    
                 <span class="help-inline" val-msg-for="password" val-toggle-msg="required">Required</span>    
                 <span class="help-inline" val-msg-for="password" val-toggle-msg="minlength">Minimum {{$parent.model.config.minPasswordLength}} characters</span>    
                 <span class="help-inline" val-msg-for="password" val-toggle-msg="valServer"></span>     
             </umb-control-group>
 
             <umb-control-group alias="confirmpassword" label="Confirm password" ng-show="$parent.showConfirmPass()">
-                <input type="text" name="confirmpassword" ng-model="$parent.model.confirm"
+                <input type="password" name="confirmpassword" ng-model="$parent.model.confirm"
                        class="input-large umb-textstring textstring"
-                       val-compare="password" no-dirty-check/>
+                       val-compare="password" no-dirty-check
+                       autocomplete="off" />
 
                 <span class="help-inline" val-msg-for="confirmpassword" val-toggle-msg="valCompare">Passwords must match</span>     
             </umb-control-group>