diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js
index a0f47a15a..0f4d0cdbf 100644
--- a/webadmin/src/js/client.js
+++ b/webadmin/src/js/client.js
@@ -1206,8 +1206,8 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
 
     Client.prototype.enableMailForDomain = function (domain, enabled, callback) {
         post('/api/v1/mail/' + domain + '/enable', { enabled: enabled }).success(function (data, status) {
-            if (status !== 202 || typeof data !== 'object') return callback(new ClientError(status, data));
-            callback(null, data);
+            if (status !== 202) return callback(new ClientError(status, data));
+            callback(null);
         }).error(defaultErrorHandler(callback));
     };
 
diff --git a/webadmin/src/views/email.html b/webadmin/src/views/email.html
index 51471c33f..5e807bfbc 100644
--- a/webadmin/src/views/email.html
+++ b/webadmin/src/views/email.html
@@ -20,7 +20,7 @@
       </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="email.enable()">I understand, enable</button>
+        <button type="button" class="btn btn-success" ng-click="enableEmail()">I understand, enable</button>
       </div>
     </div>
   </div>
@@ -96,7 +96,7 @@
     <br/>
     <div class="row">
       <div class="col-md-12" ng-show="selectedDomain.provider !== 'caas'">
-        <button ng-class="selectedDomain.mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="email.toggle()" ng-enabled="selectedDomain.mailConfig">{{ selectedDomain.mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
+        <button ng-class="selectedDomain.mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="toggleEmailEnabled()" ng-enabled="selectedDomain.mailConfig">{{ selectedDomain.mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
       </div>
       <div class="col-md-12" ng-show="selectedDomain.provider === 'caas'">
         <span class="text-danger text-bold">This feature requires the Cloudron to be on <a ng-href="{{ config.webServerOrigin + '/documentation/managed-hosting/#using-a-custom-domain' }}" target="_blank">custom domain</a>.</span>
diff --git a/webadmin/src/views/email.js b/webadmin/src/views/email.js
index 2e59ada53..cd0474b06 100644
--- a/webadmin/src/views/email.js
+++ b/webadmin/src/views/email.js
@@ -58,9 +58,9 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         }
     };
 
-    $scope.toggleEmail = function () {
+    $scope.toggleEmailEnabled = function () {
         if ($scope.selectedDomain.mailConfig.enabled) {
-            $scope.email.disable();
+            $scope.disableEmail();
             $scope.refreshDomain();
             return;
         }