diff --git a/src/views/settings.html b/src/views/settings.html
index d91bdc6f7..06873bcf3 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -58,13 +58,26 @@
                 Cloudron <a href="/#/backups">backup schedule</a>.
               </p>
 
-              <div class="row">
-                <div class="col-md-6">
-                  Days: <multiselect class="input-sm stretch" ng-model="updateSchedule.days" options="a.name for a in cronDays" data-multiple="true"></multiselect>
-                </div>
+              <div class="radio">
+                <label>
+                  <input type="radio" ng-model="updateSchedule.type" value="never"> Disable Auto Updates
+                </label>
+              </div>
+              <div class="radio">
+                <label>
+                  <input type="radio" ng-model="updateSchedule.type" value="pattern"> Enable Auto Updates
+                  <span class="label label-danger" ng-show="updateSchedule.type === 'pattern' && !updateSchedule.isScheduleValid()">Select at least one day and time</span>
+                </label>
+              </div>
+              <div>
+                <div style="margin-left: 20px;">
+                  <div class="col-md-5">
+                    Days: <multiselect class="input-sm stretch" ng-model="updateSchedule.days" ng-disabled="updateSchedule.type !== 'pattern'" options="a.name for a in cronDays" data-multiple="true"></multiselect>
+                  </div>
 
-                <div class="col-md-6">
-                  Hours: <multiselect class="input-sm stretch" ng-model="updateSchedule.hours" options="a.name for a in cronHours" data-multiple="true"></multiselect>
+                  <div class="col-md-5">
+                    Hours: <multiselect class="input-sm stretch" ng-model="updateSchedule.hours" ng-disabled="updateSchedule.type !== 'pattern'" options="a.name for a in cronHours" data-multiple="true"></multiselect>
+                  </div>
                 </div>
               </div>
             </div>
@@ -228,7 +241,9 @@
 
     <div class="row">
         <p class="col-md-12">
-          The current auto update schedule for apps is <b>{{ prettyAutoUpdateSchedule(updateSchedule.currentPattern) }}</b>.<br/>
+          <span ng-show="updateSchedule.currentPattern !== 'never'">The current auto update schedule for apps is <b>{{ prettyAutoUpdateSchedule(updateSchedule.currentPattern) }}</b>.</span>
+          <span ng-show="updateSchedule.currentPattern === 'never'">Auto update for apps is <b>disabled</b>.</span>
+          <br/>
         </p>
     </div>
 
diff --git a/src/views/settings.js b/src/views/settings.js
index b04bc37ce..64ef64504 100644
--- a/src/views/settings.js
+++ b/src/views/settings.js
@@ -198,32 +198,46 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         currentPattern: '',
         days: [],
         hours: [],
+        type: 'pattern',
+
+        isScheduleValid: function () {
+            return $scope.updateSchedule.hours.length !== 0 && $scope.updateSchedule.days !== 0;
+        },
 
         show: function () {
             $scope.updateSchedule.busy = false;
 
-            var tmp = $scope.updateSchedule.currentPattern.split(' ');
-            var hours = tmp[2].split(','), days = tmp[5].split(',');
-            if (days[0] === '*') {
-                $scope.updateSchedule.days = angular.copy($scope.cronDays, []);
+            if ($scope.updateSchedule.currentPattern === 'never') {
+                $scope.updateSchedule.type = 'never';
             } else {
-                $scope.updateSchedule.days = days.map(function (day) { return $scope.cronDays[parseInt(day, 10)]; });
+                $scope.updateSchedule.type = 'pattern';
+
+                var tmp = $scope.updateSchedule.currentPattern.split(' ');
+                var hours = tmp[2].split(','), days = tmp[5].split(',');
+                if (days[0] === '*') {
+                    $scope.updateSchedule.days = angular.copy($scope.cronDays, []);
+                } else {
+                    $scope.updateSchedule.days = days.map(function (day) { return $scope.cronDays[parseInt(day, 10)]; });
+                }
+                $scope.updateSchedule.hours = hours.map(function (hour) { return $scope.cronHours[parseInt(hour, 10)]; });
             }
-            $scope.updateSchedule.hours = hours.map(function (hour) { return $scope.cronHours[parseInt(hour, 10)]; });
 
             $('#updateScheduleModal').modal('show');
         },
 
         submit: function () {
-            var daysPattern;
-            if ($scope.updateSchedule.days.length === 7) daysPattern = '*';
-            else daysPattern = $scope.updateSchedule.days.map(function (d) { return d.value; });
+            var pattern = 'never';
+            if ($scope.updateSchedule.type === 'pattern') {
+                var daysPattern;
+                if ($scope.updateSchedule.days.length === 7) daysPattern = '*';
+                else daysPattern = $scope.updateSchedule.days.map(function (d) { return d.value; });
 
-            var hoursPattern;
-            if ($scope.updateSchedule.hours.length === 24) hoursPattern = '*';
-            else hoursPattern = $scope.updateSchedule.hours.map(function (d) { return d.value; });
+                var hoursPattern;
+                if ($scope.updateSchedule.hours.length === 24) hoursPattern = '*';
+                else hoursPattern = $scope.updateSchedule.hours.map(function (d) { return d.value; });
 
-            var pattern ='00 00 ' + hoursPattern + ' * * ' + daysPattern;
+                pattern ='00 00 ' + hoursPattern + ' * * ' + daysPattern;
+            }
 
             $scope.updateSchedule.busy = true;