diff --git a/src/js/client.js b/src/js/client.js
index 01151fd51..a4f1cf49b 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -469,6 +469,15 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.repairApp = function (id, data, callback) {
+        post('/api/v1/apps/' + id + '/configure/repair', data, null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200 && status !== 202) return callback(new ClientError(status, data));
+
+            callback(null, data);
+        });
+    };
+
     Client.prototype.updateApp = function (id, manifest, callback) {
         var data =  {
             appStoreId: manifest.id + '@' + manifest.version
diff --git a/src/views/app.html b/src/views/app.html
index 28a33b10e..1863fd5de 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -83,25 +83,56 @@
 
 <!-- Modal domain collision -->
 <div class="modal fade" id="domainCollisionsModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-      <div class="modal-content">
-          <div class="modal-header">
-            <h4 class="modal-title">Domain Collision</h4>
-          </div>
-        <div class="modal-body">
-          <p>By default Cloudron does not overwrite DNS records which exist outside of Cloudron.</p>
-          <p>The following domains already exist outside of Cloudron:</p>
-          <ul>
-            <li ng-repeat="domain in location.domainCollisions">{{ domain.subdomain + '.' + domain.domain }}</li>
-          </ul>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-          <button type="button" class="btn btn-danger" ng-click="location.submit(true)">Overwrite existing DNS Records</button>
+  <div class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">Domain Collision</h4>
         </div>
+      <div class="modal-body">
+        <p>By default Cloudron does not overwrite DNS records which exist outside of Cloudron.</p>
+        <p>The following domains already exist outside of Cloudron:</p>
+        <ul>
+          <li ng-repeat="domain in location.domainCollisions">{{ domain.subdomain + '.' + domain.domain }}</li>
+        </ul>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-danger" ng-click="location.submit(true)">Overwrite existing DNS Records</button>
       </div>
     </div>
   </div>
+</div>
+
+<!-- Modal repair -->
+<div class="modal fade" id="repairModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Repair {{ app.fqdn }}</h4>
+      </div>
+      <div class="modal-body">
+        <p>TBD info about error and potential solution</p>
+        <!-- show this if alternate domains may need to be disabled -->
+        <div>
+          <p ng-repeat="alternateDomain in repair.optionalDomains">
+            <label class="control-label"><input type="checkbox" ng-model="alternateDomain.enabled"> {{ alternateDomain.subdomain }}.{{ alternateDomain.domain }}</label>
+          </p>
+        </div>
+        <!-- show this for restore -->
+        <div>
+          <label class="control-label">Restore from Backup:</label>
+          <select class="form-control" ng-model="repair.backupId">
+            <option ng-repeat="backup in repair.backups" value="{{ backup.id }}">{{ backup.creationTime | prettyDate }} - v{{ backup.version }}</option>
+          </select>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-success" ng-click="repair.submit()" ng-disabled="repair.busy"><i class="fa fa-circle-notch fa-spin" ng-show="repair.busy"></i> Repair</button>
+      </div>
+    </div>
+  </div>
+</div>
 
 <!-- Modal update app -->
 <div class="modal fade" id="updateModal" tabindex="-1" role="dialog">
@@ -660,6 +691,7 @@
           <div class="col-md-12">
             <label class="control-label">Repair</label>
             <p>If the app is not responding, try restarting the app.</p>
+            <button class="btn btn-success" ng-click="repair.show()" ng-show="app.error">Repair App</button>
             <button class="btn btn-danger pull-right" ng-click="debug.stopAppTask(app.taskId)" ng-show="app.taskId">Cancel Current Task</button>
             <button class="btn btn-danger pull-right" ng-click="debug.restartApp()" ng-disabled="app.taskId || debug.appIsRestarting"><i class="fa fa-circle-notch fa-spin" ng-show="debug.appIsRestarting"></i> Restart App</button>
           </div>
diff --git a/src/views/app.js b/src/views/app.js
index 87f10449d..12ca1fe1f 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -745,6 +745,49 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         }
     }
 
+    $scope.repair = {
+        busy: false,
+        error: {},
+
+        optionalDomains: [],
+        backups: [],
+
+        backupId: '',
+
+        show: function () {
+            $scope.repair.error = {};
+            $scope.repair.busy = false;
+
+            $scope.repair.optionalDomains = $scope.app.alternateDomains;
+            $scope.repair.optionalDomains.forEach(function (d) {
+                d.enabled = true;
+            });
+
+            Client.getAppBackups($scope.app.id, function (error, backups) {
+                if (error) return Client.error(error);
+
+                $scope.repair.backups = backups;
+                $scope.repair.backupId = '';
+
+                $('#repairModal').modal('show');
+            });
+        },
+
+        submit: function () {
+            $scope.repair.error = {};
+            $scope.repair.busy = true;
+
+            // TODO pass disabled domain info or backupId
+
+            Client.repairApp($scope.app.id, {}, function (error) {
+                if (error) return Client.error(error);
+
+                $scope.repair.busy = false;
+                $('#repairModal').modal('hide');
+            });
+        }
+    }
+
     $scope.postInstallConfirm = {
         message: '',
         confirmed: false,