diff --git a/webadmin/src/js/index.js b/webadmin/src/js/index.js
index 485a20511..026f0bc27 100644
--- a/webadmin/src/js/index.js
+++ b/webadmin/src/js/index.js
@@ -110,7 +110,15 @@ app.filter('activeOAuthClients', function () {
 
 app.filter('prettyAppMessage', function () {
     return function (message) {
-        if (message === 'ETRYAGAIN') return 'The DNS record for this location is not setup correctly. Please verify your DNS settings and restore this app.';
+        if (message === 'ETRYAGAIN') return 'The DNS record for this location is not setup correctly. Please verify your DNS settings and repair this app.';
+        if (message === 'DNS Record already exists') return 'The DNS record for this location already exists. Manually remove the DNS record and then click on repair.';
+        return message;
+    };
+});
+
+app.filter('shortAppMessage', function () {
+    return function (message) {
+        if (message === 'ETRYAGAIN') return 'DNS record not setup correctly';
         return message;
     };
 });
diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index bd984bf37..bca81b1c4 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -270,9 +270,10 @@
                 <h4 class="modal-title">Error for {{ appError.app.fqdn }}</h4>
             </div>
             <div class="modal-body">
-                <p>{{appError.app.message | prettyAppMessage }}</p>
+                <p>{{ appError.app.message | prettyAppMessage }}</p>
             </div>
             <div class="modal-footer">
+                <button type="button" class="btn btn-default pull-left" ng-click="showConfigure(appError.app)">Repair</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
             </div>
         </div>
@@ -385,7 +386,7 @@
 
     <div class="row animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
         <div class="col-sm-1 grid-item" ng-repeat="app in installedApps | orderBy:'location'">
-            <div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.message | prettyAppMessage }}">
+            <div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.message | shortAppMessage }}">
                 <a ng-href="{{ app | applicationLink }}" ng-click="(app | installError) === true && showError(app)" target="_blank" ng-class="{ 'hand': !(app | installationActive) }">
                     <div class="grid-item-top">
                         <div class="row">
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index 0b6765184..f01e66ae9 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -94,6 +94,14 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     };
 
     $scope.reset = function () {
+        // close all dialogs
+        $('#appErrorModal').modal('hide');
+        $('#appConfigureModal').modal('hide');
+        $('#appRestoreModal').modal('hide');
+        $('#appUpdateModal').modal('hide');
+        $('#appPostInstallModal').modal('hide');
+        $('#appUninstallModal').modal('hide');
+
         // reset configure dialog
         $scope.appConfigure.error = {};
         $scope.appConfigure.app = {};