diff --git a/src/js/client.js b/src/js/client.js
index cbb1a37b6..b4a26e58a 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -368,6 +368,7 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
             xFrameOptions: config.xFrameOptions,
             robotsTxt: config.robotsTxt || null,
             enableBackup: config.enableBackup,
+            enableAutomaticUpdate: config.enableAutomaticUpdate
         };
 
         if ('mailboxName' in config) data.mailboxName = config.mailboxName;
diff --git a/src/views/apps.html b/src/views/apps.html
index 94bc542db..276301c89 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -168,6 +168,11 @@
                                     <label class="control-label" for="appConfigureEnableBackup">Enable automatic daily backups</label>
                                 </div>
 
+                                <div class="form-group">
+                                    <input type="checkbox" id="appConfigureEnableAutomaticUpdate" ng-model="appConfigure.enableAutomaticUpdate">
+                                    <label class="control-label" for="appConfigureEnableAutomaticUpdate">Enable automatic updates</label>
+                                </div>
+
                                 <div class="hide">
                                     <label class="control-label" for="appConfigureCertificateInput" ng-show="appConfigure.domain.provider !== 'caas'">Certificate (optional)</label>
                                     <div class="has-error text-center" ng-show="appConfigure.error.cert && appConfigure.domain.provider !== 'caas'">{{ appConfigure.error.cert }}</div>
diff --git a/src/views/apps.js b/src/views/apps.js
index 747d20d5c..7fade640a 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -65,6 +65,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             $scope.appConfigure.alternateDomain = app.alternateDomains[0] ? $scope.domains.filter(function (d) { return d.domain === app.alternateDomains[0].domain; })[0] : $scope.appConfigure.domain;
             $scope.appConfigure.robotsTxt = app.robotsTxt;
             $scope.appConfigure.enableBackup = app.enableBackup;
+            $scope.appConfigure.enableAutomaticUpdate = app.enableAutomaticUpdate;
             $scope.appConfigure.mailboxNameEnabled = app.mailboxName && (app.mailboxName.match(/\.app$/) === null);
             $scope.appConfigure.mailboxName = app.mailboxName || '';
 
@@ -142,6 +143,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                 memoryLimit: $scope.appConfigure.memoryLimit === $scope.appConfigure.memoryTicks[0] ? 0 : $scope.appConfigure.memoryLimit,
                 robotsTxt: $scope.appConfigure.robotsTxt,
                 enableBackup: $scope.appConfigure.enableBackup,
+                enableAutomaticUpdate: $scope.appConfigure.enableAutomaticUpdate,
                 alternateDomains: []
             };
 
@@ -413,6 +415,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.ssoAuth = false;
         $scope.appConfigure.robotsTxt = '';
         $scope.appConfigure.enableBackup = true;
+        $scope.appConfigure.enableAutomaticUpdate = true;
 
         $scope.appConfigureForm.$setPristine();
         $scope.appConfigureForm.$setUntouched();