diff --git a/src/js/index.js b/src/js/index.js
index f48f118bb..4044c2257 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -168,7 +168,6 @@ var ISTATES = {
     PENDING_CONFIGURE: 'pending_configure',
     PENDING_UNINSTALL: 'pending_uninstall',
     PENDING_RESTORE: 'pending_restore',
-    PENDING_REPAIR: 'pending_repair',
     PENDING_UPDATE: 'pending_update',
     PENDING_BACKUP: 'pending_backup',
     PENDING_RECREATE_CONTAINER: 'pending_recreate_container', // env change or addon change
@@ -350,12 +349,10 @@ app.filter('installationStateLabel', function () {
             return 'Migrating data' + waiting;
         case ISTATES.PENDING_UNINSTALL: return 'Uninstalling' + waiting;
         case ISTATES.PENDING_RESTORE: return 'Restoring' + waiting;
-        case ISTATES.PENDING_REPAIR: return 'Repairing' + waiting;
         case ISTATES.PENDING_UPDATE: return 'Updating' + waiting;
         case ISTATES.PENDING_BACKUP: return 'Backing up' + waiting;
         case ISTATES.PENDING_START: return 'Starting' + waiting;
         case ISTATES.PENDING_STOP: return 'Stopping' + waiting;
-        case ISTATES.PENDING_REPAIR: return 'Repairing' + waiting;
         case ISTATES.ERROR: {
             if (app.error && app.error.message === 'ETRYAGAIN') return 'DNS Error';
             return 'Error';
@@ -375,6 +372,30 @@ app.filter('installationStateLabel', function () {
     };
 });
 
+app.filter('taskName', function () {
+    return function(app) {
+        if (!app) return '';
+
+        switch (app.installationState) {
+        case ISTATES.PENDING_INSTALL: return 'install';
+        case ISTATES.PENDING_CLONE: return 'clone';
+        case ISTATES.PENDING_LOCATION_CHANGE: return 'location change';
+        case ISTATES.PENDING_CONFIGURE: return 'configure';
+        case ISTATES.PENDING_RECREATE_CONTAINER: return 'create container';
+        case ISTATES.PENDING_DEBUG: return 'debug';
+        case ISTATES.PENDING_RESIZE: return 'resize';
+        case ISTATES.PENDING_DATA_DIR_MIGRATION: return 'data migration';
+        case ISTATES.PENDING_UNINSTALL: return 'uninstall';
+        case ISTATES.PENDING_RESTORE: return 'restore';
+        case ISTATES.PENDING_UPDATE: return 'update';
+        case ISTATES.PENDING_BACKUP: return 'backup';
+        case ISTATES.PENDING_START: return 'start app';
+        case ISTATES.PENDING_STOP: return 'stop app';
+        default: return app.installationState;
+        }
+    };
+});
+
 app.filter('readyToUpdate', function () {
     return function (apps) {
         return apps.every(function (app) {
diff --git a/src/views/app.html b/src/views/app.html
index fa806389c..93b4bfc9d 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -111,7 +111,7 @@
         <h4 class="modal-title">Repair {{ app.fqdn }}</h4>
       </div>
       <div class="modal-body">
-        <p>The app task <b>{{ app.error.task | installationStateLabel:user }}</b> failed. Repair will attempt to retry.</p>
+        <p>The <b>{{ app.error.task | taskName }}</b> operation failed. Click repair to retry.</p>
         <p class="text-danger">{{ app.error.message }}</p>
         <div class="form-group" ng-show="repair.location && repair.domain">
             <label class="control-label">Location</label>
@@ -719,7 +719,7 @@
             <label class="control-label">Repair</label>
             <p>Use the repair button to retry failed operations.</p>
 
-            <p ng-show="app.error">An error occurred during the previous operation: <span class="text-danger"><b>{{ app.error.message }}</b></span></p>
+            <p ng-show="app.error">An error occurred during the <b>{{ app.error.task | taskName }}</b> operation: <span class="text-danger"><b>{{ app.error.message }}</b></span></p>
             <button class="btn btn-success pull-right" ng-click="repair.show()" ng-disabled="!app.error">Repair</button>
 
             <button class="btn btn-danger pull-right" ng-click="debug.stopAppTask(app.taskId)" ng-show="app.taskId">Cancel Current Task</button>