diff --git a/static/js/controllers.js b/static/js/controllers.js
index 100805a5c..d9870ae52 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -563,6 +563,11 @@ function UserAdminCtrl($scope, $timeout, Restangular, PlanService, UserService,
       $scope.updatingUser = false;
       $scope.changePasswordSuccess = true;
 
+      // Reset the form
+      $scope.user.password = '';
+      $scope.user.repeatPassword = '';
+      $scope.changePasswordForm.$setPristine();
+
       UserService.load();
     }, function(result) {
       $scope.updatingUser = false;
diff --git a/static/partials/user-admin.html b/static/partials/user-admin.html
index 39201569d..16df0fe00 100644
--- a/static/partials/user-admin.html
+++ b/static/partials/user-admin.html
@@ -69,7 +69,7 @@
         <div class="panel-body">
           <form class="form-change-pw" name="changePasswordForm" ng-submit="changePassword()" data-trigger="manual" data-content="{{ changePasswordError }}" data-placement="right" ng-show="!awaitingConfirmation && !registering">
             <input type="password" class="form-control" placeholder="Your new password" ng-model="user.password" required>
-            <input type="password" class="form-control" placeholder="Verify your new password" ng-model="user.repeatePassword" match="user.password" required>
+            <input type="password" class="form-control" placeholder="Verify your new password" ng-model="user.repeatPassword" match="user.password" required>
             <button class="btn btn-danger" ng-disabled="changePasswordForm.$invalid" type="submit" analytics-on analytics-event="register">Change Password</button>
             <span class="help-block" ng-show="changePasswordSuccess">Password changed successfully</span>
           </form>