diff --git a/src/views/emails.js b/src/views/emails.js
index 3cf1dd8f7..a5f42cfaf 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -93,6 +93,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         percent: 0,
         message: '',
         errorMessage: '',
+        reconfigure: false,
 
         refresh: function () {
             Client.getMailLocation(function (error, location) {
@@ -105,9 +106,8 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
                     if (error) return console.error(error);
                     if (!task) return;
 
-                    $scope.reconfigureEmailApps();
-
                     $scope.mailLocation.taskId = task.id;
+                    $scope.mailLocation.reconfigure = task.active; // if task is active when this view reloaded, reconfigure email apps when task done
                     $scope.mailLocation.updateStatus();
                 });
             });
@@ -136,6 +136,9 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
                     $scope.mailLocation.message = '';
                     $scope.mailLocation.percent = 0;
                     $scope.mailLocation.errorMessage = data.success ? '' : data.error.message;
+
+                    if ($scope.mailLocation.reconfigure) $scope.reconfigureEmailApps();
+
                     return;
                 }
 
@@ -161,6 +164,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
                 $scope.mailLocation.currentLocation = { subdomain: $scope.mailLocation.subdomain, domain: $scope.mailLocation.domain };
 
                 $scope.mailLocation.taskId = result.taskId;
+                $scope.mailLocation.reconfigure = true; // reconfigure email apps when task done
                 $scope.mailLocation.updateStatus();
 
                 $('#mailLocationModal').modal('hide');