diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
index ed20203d46..dad7932de4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
@@ -164,7 +164,7 @@
 
         function inviteSavePassword() {
 
-            if (formHelper.submitForm({ scope: $scope })) {
+            if (formHelper.submitForm({ scope: $scope, formCtrl: vm.inviteUserPasswordForm })) {
 
                 vm.invitedUserPasswordModel.buttonState = "busy";
 
@@ -172,7 +172,7 @@
                     .then(function (data) {
 
                         //success
-                        formHelper.resetForm({ scope: $scope });
+                        formHelper.resetForm({ scope: $scope, formCtrl: vm.inviteUserPasswordForm });
                         vm.invitedUserPasswordModel.buttonState = "success";
                         //set the user and set them as logged in
                         vm.invitedUser = data;
@@ -181,7 +181,7 @@
                         vm.inviteStep = 2;
 
                     }, function (err) {
-                        formHelper.resetForm({ scope: $scope, hasErrors: true });
+                        formHelper.resetForm({ scope: $scope, hasErrors: true, formCtrl: vm.inviteUserPasswordForm });
                         formHelper.handleError(err);
                         vm.invitedUserPasswordModel.buttonState = "error";
                     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index e13e8df1d2..6224d9426b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -10,7 +10,7 @@
 
         <div ng-if="!vm.denyLocalLogin" ng-show="vm.invitedUser != null" class="umb-login-container">
 
-            <form name="inviteUserPasswordForm" novalidate="" ng-submit="vm.inviteSavePassword()" val-form-manager>
+            <form name="vm.inviteUserPasswordForm" novalidate="" ng-submit="vm.inviteSavePassword()" val-form-manager>
                 <div class="form" ng-if="vm.inviteStep === 1">
                     <h1 style="margin-bottom: 10px; text-align: left;">Hi, {{vm.invitedUser.name}}</h1>
                     <p style="line-height: 1.6; margin-bottom: 25px;">
@@ -79,7 +79,7 @@
                                         size="xl"
                                         unknown-char="+"
                                         img-src="{{vm.invitedUser.avatars[3]}}"
-                                        img-srcset="{{vm.invitedUser.avatars[4]}} 2x, {{invitedUser.avatars[4]}} 3x">
+                                        img-srcset="{{vm.invitedUser.avatars[4]}} 2x, {{vm.invitedUser.avatars[4]}} 3x">
                             </umb-avatar>
                         </a>