diff --git a/src/views/apps.html b/src/views/apps.html
index d5957fb72..184f65365 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -200,16 +200,13 @@
                   </div>
                   <br/>
                   <fieldset>
-                    <form role="form" name="appRestoreForm" ng-submit="appRestore.restore()" autocomplete="off">
-                      <div class="form-group" ng-class="{ 'has-error': (appRestoreForm.password.$dirty && appRestoreForm.password.$invalid) || (!appRestoreForm.password.$dirty && appRestore.error.password) }">
+                    <form role="form" ng-submit="appRestore.restore()" autocomplete="off">
+                      <div class="form-group" ng-class="{ 'has-error': appRestore.error.password }">
                         <label class="control-label" for="appRestorePasswordInput">Provide your password to confirm this action</label>
-                        <div class="control-label" ng-show="(appRestoreForm.password.$dirty && appRestoreForm.password.$invalid) || (!appRestoreForm.password.$dirty && appRestore.error.password)">
-                          <small ng-show=" appRestoreForm.password.$dirty && appRestoreForm.password.$invalid">Password required</small>
-                          <small ng-show="!appRestoreForm.password.$dirty && appRestore.error.password">Wrong password</small>
-                        </div>
+                        <div ng-show="appRestore.error.password"><small>Wrong password</small></div>
                         <input type="password" class="form-control" ng-model="appRestore.password" id="appRestorePasswordInput" name="password" required autofocus>
                       </div>
-                      <input class="ng-hide" type="submit" ng-disabled="appRestoreForm.$invalid || busy"/>
+                      <input class="ng-hide" type="submit" ng-disabled="!appRestore.password || appRestore.busy || !appRestore.selectedBackup"/>
                     </form>
                   </fieldset>
                 </uib-tab>
@@ -272,7 +269,7 @@
               <button type="button" class="btn btn-primary pull-left" ng-click="appRestore.createBackup()" ng-disabled="appRestore.app.installationState === 'pending_backup'" uib-tooltip="Take a live snapshot of this app" tooltip-placement="right"><i class="fa fa-circle-o-notch fa-spin" ng-show="appRestore.app.installationState === 'pending_backup'"></i> Create Backup</button>
               <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
               <button type="button" class="btn btn-success" ng-click="appRestore.clone()" ng-show="appRestore.action === 'clone' && appRestore.backups.length !== 0" ng-disabled="appCloneForm.$invalid || appRestore.busy || !appRestore.selectedBackup"><i class="fa fa-circle-o-notch fa-spin" ng-show="appRestore.busy"></i> Clone</button>
-              <button type="button" class="btn btn-danger" ng-click="appRestore.restore()" ng-show="appRestore.action === 'restore' && appRestore.backups.length !== 0" ng-disabled="appRestoreForm.$invalid || appRestore.busy || !appRestore.selectedBackup"><i class="fa fa-circle-o-notch fa-spin" ng-show="appRestore.busy"></i> Restore</button>
+              <button type="button" class="btn btn-danger" ng-click="appRestore.restore()" ng-show="appRestore.action === 'restore' && appRestore.backups.length !== 0" ng-disabled="!appRestore.password || appRestore.busy || !appRestore.selectedBackup"><i class="fa fa-circle-o-notch fa-spin" ng-show="appRestore.busy"></i> Restore</button>
             </div>
         </div>
     </div>
diff --git a/src/views/apps.js b/src/views/apps.js
index 8089aa77a..a22ac97cb 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -290,7 +290,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                 if (error && error.statusCode === 403) {
                     $scope.appRestore.password = '';
                     $scope.appRestore.error.password = true;
-                    $scope.appRestoreForm.password.$setPristine();
                     $('#appRestorePasswordInput').focus();
                 } else if (error) {
                     Client.error(error);
@@ -380,11 +379,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appRestore.portBindingsInfo = {};
         $scope.appRestore.portBindingsEnabled = {};
         $scope.appRestore.action = 'restore';
-
-        if ($scope.appRestoreForm) {
-            $scope.appRestoreForm.$setPristine();
-            $scope.appRestoreForm.$setUntouched();
-        }
     };
 
     $scope.readCertificate = function (event) {