diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
index 9c322f3f5d..71d84a8412 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.controller.js
@@ -61,7 +61,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.ChangePasswordCont
             if (!isNew) {
                 $scope.model.confirm = "";
             }
-            else if ($scope.model.value.newPassword.length > 0) {
+            else if ($scope.model.value.newPassword && $scope.model.value.newPassword.length > 0) {
                 //if it is new and a new password has been set, then set the confirm password too
                 $scope.model.confirm = $scope.model.value.newPassword;
             }