diff --git a/src/views/emails.html b/src/views/emails.html
index 59e30124b..a48821fc6 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -7,7 +7,7 @@
       </div>
       <div class="modal-body">
         <div>Cloudron will make the necessary DNS changes across all the domains and restart the mail server.
-          Mail clients have to be re-configured to use this new location as the IMAP and SMTP server.
+          Desktop &amp; Mobile email clients have to be re-configured to use this new location as the IMAP and SMTP server.
         </div>
         <br>
 
@@ -218,7 +218,7 @@
       </div>
       <div class="col-xs-6 text-right">
         <span>{{ mailLocation.currentLocation.subdomain + (!mailLocation.currentLocation.subdomain ? '' : '.') + mailLocation.currentLocation.domain.domain }}
-          <a href="" ng-click="mailLocation.show()"><i class="fa fa-edit text-small"></i></a>
+          <a ng-hide="mailLocation.busy" href="" ng-click="mailLocation.show()"><i class="fa fa-edit text-small"></i></a> <!-- ng-disabled does not work for links -->
         </span>
       </div>
       <div class="col-xs-6">
diff --git a/src/views/emails.js b/src/views/emails.js
index 0f7529469..3cf1dd8f7 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -91,6 +91,8 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         subdomain: '',
         taskId: null,
         percent: 0,
+        message: '',
+        errorMessage: '',
 
         refresh: function () {
             Client.getMailLocation(function (error, location) {