diff --git a/src/views/settings.html b/src/views/settings.html
index b2dab96bf..36737b173 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -41,6 +41,44 @@
     </div>
 </div>
 
+<!-- modal update schedule config -->
+<div class="modal fade" id="updateScheduleModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Configure Auto Update Schedule</h4>
+      </div>
+      <div class="modal-body">
+        <form name="updateScheduleForm" role="form" novalidate ng-submit="updateSchedule.submit()" autocomplete="off">
+          <fieldset>
+            <p class="has-error text-center" ng-show="updateSchedule.error">{{ updateSchedule.error.generic }}</p>
+
+            <div class="form-group">
+              <p>Select the days and hours during which Cloudron will apply automatic app updates. Please take into account that Cloudron will always
+                backup the app before an automatic update.
+              </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="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>
+              </div>
+            </div>
+          </fieldset>
+        </form>
+      </div>
+      <div class="modal-footer ">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="updateSchedule.submit()" ng-disabled="updateSchedule.$invalid || updateSchedule.busy"><i class="fa fa-circle-notch fa-spin" ng-show="updateSchedule.busy"></i><span> Save</span></button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal registry config -->
 <div class="modal fade" id="registryConfigModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
@@ -187,71 +225,41 @@
   </div>
 
   <div class="card" style="margin-bottom: 15px;">
-      <div class="row">
-          <div class="col-md-12">
-              <p>Configure the update schedule for apps</p>
-          </div>
-      </div>
 
-      <div class="row">
-          <div class="col-md-12">
-              <div class="radio">
-                <label>
-                  <input type="radio" name="scheduleRadio" ng-model="autoUpdate.pattern" value="00 15 1,3,5,23 * * *">
-                  Every night
-                </label>
-              </div>
-              <div class="radio">
-                <label>
-                  <input type="radio" name="scheduleRadio" ng-model="autoUpdate.pattern" value="00 00 3,5 * * 3">
-                  Wednesday night
-                </label>
-              </div>
-              <div class="radio">
-                <label>
-                  <input type="radio" name="scheduleRadio" ng-model="autoUpdate.pattern" value="00 00 1,3,5,23 * * 6">
-                  Saturday night
-                </label>
-              </div>
-              <div class="radio">
-                <label>
-                  <input type="radio" name="scheduleRadio" ng-model="autoUpdate.pattern" value="never">
-                  No automatic updates
-                </label>
-              </div>
-          </div>
-      </div>
+    <div class="row">
+        <p class="col-md-12">
+          The current auto update schedule for apps is <b>{{ prettyAutoUpdateSchedule(updateSchedule.currentPattern) }}</b>.<br/>
+        </p>
+    </div>
 
-      <div class="row">
-        <br/>
-        <div ng-if="update.busy" class="col-md-12" style="margin-bottom: 10px;">
-          <div class="progress progress-striped active animateMe">
-            <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ update.percent }}%"></div>
-          </div>
+    <div class="row">
+      <br/>
+      <div ng-if="update.busy" class="col-md-12" style="margin-bottom: 10px;">
+        <div class="progress progress-striped active animateMe">
+          <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ update.percent }}%"></div>
         </div>
       </div>
+    </div>
 
-      <div class="row">
-        <div class="col-md-7">
-          <p ng-show="update.busy">{{ update.message }}</p>
-          <p ng-if="update.busy">
-            <div class="has-error" ng-show="update.errorMessage">
-              {{ update.errorMessage }}. <a ng-class="warning" ng-href="/logs.html?taskId={{update.taskId}}" target="_blank">Show Logs</a>
-            </div>
-          </p>
-        </div>
-
-        <div class="col-md-5 text-right">
-          <button class="btn btn-outline btn-primary pull-right" ng-click="autoUpdate.submit()" ng-disabled="autoUpdate.pattern === autoUpdate.currentPattern">
-            <i class="fa fa-circle-notch fa-spin" ng-show="autoUpdate.busy"></i> Save
-          </button>
-          <button class="btn btn-default pull-right" ng-show="!config.update.box && !update.busy" ng-disabled="update.checking" ng-click="update.checkNow()">
-            <i class="fa fa-circle-notch fa-spin" ng-show="update.checking"></i> Check for Updates
-          </button>
-          <button ng-class="config.update.box.unstable ? 'btn btn-danger pull-right' : 'btn btn-success pull-right'" ng-show="config.update.box && !update.busy" ng-click="update.show()">Update Available</button>
-          <button class="btn btn-danger pull-right" ng-show="config.update.box && update.busy" ng-click="update.stopUpdate()">Stop Update</button>
-        </div>
+    <div class="row">
+      <div class="col-md-6">
+        <p ng-show="update.busy">{{ update.message }}</p>
+        <p ng-if="update.busy">
+          <div class="has-error" ng-show="update.errorMessage">
+            {{ update.errorMessage }}. <a ng-class="warning" ng-href="/logs.html?taskId={{update.taskId}}" target="_blank">Show Logs</a>
+          </div>
+        </p>
       </div>
+
+      <div class="col-md-6 text-right">
+        <button class="btn btn-outline btn-primary pull-right" ng-click="updateSchedule.show()">Change Schedule</button>
+        <button class="btn btn-default pull-right" ng-show="!config.update.box && !update.busy" ng-disabled="update.checking" ng-click="update.checkNow()">
+          <i class="fa fa-circle-notch fa-spin" ng-show="update.checking"></i> Check for Updates
+        </button>
+        <button ng-class="config.update.box.unstable ? 'btn btn-danger pull-right' : 'btn btn-success pull-right'" ng-show="config.update.box && !update.busy" ng-click="update.show()">Update Available</button>
+        <button class="btn btn-danger pull-right" ng-show="config.update.box && update.busy" ng-click="update.stopUpdate()">Stop Update</button>
+      </div>
+    </div>
   </div>
 
   <div class="text-left">
diff --git a/src/views/settings.js b/src/views/settings.js
index fcce43666..b04bc37ce 100644
--- a/src/views/settings.js
+++ b/src/views/settings.js
@@ -14,6 +14,26 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
     $scope.subscription = null;
     $scope.subscriptionBusy = true;
 
+    // values correspond to cron days
+    $scope.cronDays = [
+        { name: 'Sunday', value: 0 },
+        { name: 'Monday', value: 1 },
+        { name: 'Tuesday', value: 2 },
+        { name: 'Wednesday', value: 3 },
+        { name: 'Thursday', value: 4 },
+        { name: 'Friday', value: 5 },
+        { name: 'Saturday', value: 6 },
+    ];
+
+    $scope.cronHours = [
+        { name: 'Midnight', value: 0 }, { name: '1 AM', value: 1 }, { name: '2 AM', value: 2 }, { name: '3 AM', value: 3 },
+        { name: '4 AM', value: 4 }, { name: '5 AM', value: 5 }, { name: '6 AM', value: 6 }, { name: '7 AM', value: 7 },
+        { name: '8 AM', value: 8 }, { name: '9 AM', value: 9 }, { name: '10 AM', value: 10 }, { name: '11 AM', value: 11 },
+        { name: 'Noon', value: 12 }, { name: '1 PM', value: 13 }, { name: '2 PM', value: 14 }, { name: '3 PM', value: 15 },
+        { name: '4 PM', value: 16 }, { name: '5 PM', value: 17 }, { name: '6 PM', value: 18 }, { name: '7 PM', value: 19 },
+        { name: '8 PM', value: 20 }, { name: '9 PM', value: 21 }, { name: '10 PM', value: 22 }, { name: '11 PM', value: 23 }
+    ];
+
     $scope.openSubscriptionSetup = function () {
         Client.openSubscriptionSetup($scope.subscription || {});
     };
@@ -25,6 +45,22 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         }
     };
 
+    $scope.prettyAutoUpdateSchedule = function (pattern) {
+        if (!pattern) return '';
+        var tmp = pattern.split(' ');
+        var hours = tmp[2].split(','), days = tmp[5].split(',');
+        var prettyDay;
+        if (days.length === 7 || days[0] === '*') {
+            prettyDay = 'Everyday';
+        } else  {
+            prettyDay = days.map(function (day) { return $scope.cronDays[parseInt(day, 10)].name.substr(0, 3); }).join(',');
+        }
+
+        var prettyHour = hours.map(function (hour) { return $scope.cronHours[parseInt(hour, 10)].name; }).join(',');
+
+        return prettyDay + ' at ' + prettyHour;
+    };
+
     $scope.update = {
         error: {}, // this is for the dialog
         busy: false,
@@ -157,22 +193,47 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         }
     };
 
-    $scope.autoUpdate = {
+    $scope.updateSchedule = {
         busy: false,
-        pattern: '',
         currentPattern: '',
+        days: [],
+        hours: [],
+
+        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, []);
+            } 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)]; });
+
+            $('#updateScheduleModal').modal('show');
+        },
 
         submit: function () {
-            if ($scope.autoUpdate.pattern === $scope.autoUpdate.currentPattern) return;
+            var daysPattern;
+            if ($scope.updateSchedule.days.length === 7) daysPattern = '*';
+            else daysPattern = $scope.updateSchedule.days.map(function (d) { return d.value; });
 
-            $scope.autoUpdate.busy = true;
+            var hoursPattern;
+            if ($scope.updateSchedule.hours.length === 24) hoursPattern = '*';
+            else hoursPattern = $scope.updateSchedule.hours.map(function (d) { return d.value; });
 
-            Client.setAppAutoupdatePattern($scope.autoUpdate.pattern, function (error) {
+            var pattern ='00 00 ' + hoursPattern + ' * * ' + daysPattern;
+
+            $scope.updateSchedule.busy = true;
+
+            Client.setAppAutoupdatePattern(pattern, function (error) {
                 if (error) Client.error(error);
-                else $scope.autoUpdate.currentPattern = $scope.autoUpdate.pattern;
 
                 $timeout(function () {
-                    $scope.autoUpdate.busy = false;
+                    $scope.updateSchedule.busy = false;
+                    if (!error) $scope.updateSchedule.currentPattern = pattern;
+                    $('#updateScheduleModal').modal('hide');
                 }, 3000);
             });
         }
@@ -194,8 +255,8 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             // just keep the UI sane by supporting previous default pattern
             if (result.pattern === '00 30 1,3,5,23 * * *') result.pattern = '00 15 1,3,5,23 * * *';
 
-            $scope.autoUpdate.currentPattern = result.pattern;
-            $scope.autoUpdate.pattern = result.pattern;
+            $scope.updateSchedule.currentPattern = result.pattern;
+            $scope.updateSchedule.pattern = result.pattern;
         });
     }