diff --git a/dashboard/src/index.html b/dashboard/src/index.html
index 22f88104d..543aefdb1 100644
--- a/dashboard/src/index.html
+++ b/dashboard/src/index.html
@@ -90,63 +90,13 @@
         </div>
     </script>
 
-    <!-- Modal update -->
-    <div class="modal fade" id="updateModal" tabindex="-1" role="dialog" aria-labelledby="updateModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    <h4 class="modal-title" id="updateModalLabel">Cloudron Update to <b>{{config.update.box.version}}</b> </h4>
-                </div>
-                <div class="modal-body">
-                    <div ng-hide="installedApps | readyToUpdate">
-                        <p>The apps below are blocking the update because they have pending actions:</p>
-                        <ul>
-                            <li ng-repeat="app in installedApps | inProgressApps">{{app.location}}</li>
-                        </ul>
-                        <br/>
-                        <b class="text-danger">Please wait for the app actions to finish.</b>
-                        <br/>
-                        <br/>
-                    </div>
-
-                    <div ng-show="installedApps | readyToUpdate">
-                        <b ng-show="config.update.box.upgrade" class="text-danger">
-                            This update upgrades the base system and will cause some application downtime.<br/>
-                        </b>
-                        <p>Changes:</p>
-                        <ul>
-                            <li ng-repeat="change in config.update.box.changelog" ng-bind-html="change | markdown2html"></li>
-                        </ul>
-                        <br/>
-                        <p ng-show="update.error.generic" class="text-danger">{{ update.error.generic }}</p>
-                        <div ng-hide="config.provider !== 'caas' && config.update.box.upgrade">
-                            <fieldset>
-                                <form name="update_form" role="form" ng-submit="doUpdate()" autocomplete="off">
-                                    <input class="ng-hide" type="submit" ng-disabled="update_form.$invalid || update.busy"/>
-                                </form>
-                            </fieldset>
-                        </div>
-                        <div ng-show="config.provider !== 'caas' && config.update.box.upgrade">
-                            <b>Please use the CLI tool to upgrade by following the instructions <a ng-href="{{ config.webServerOrigin + '/documentation/updates/' }}" target="_blank" >here</a>.</b>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    <button type="button" class="btn btn-success" ng-click="doUpdate()" ng-disabled="update_form.$invalid || update.busy" ng-show="(installedApps | readyToUpdate) && !(config.provider !== 'caas' && config.update.box.upgrade)"><i class="fa fa-circle-o-notch fa-spin" ng-show="update.busy"></i> Update</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <!-- Modal setup subscription -->
     <div class="modal fade" id="setupSubscriptionModal" tabindex="-1" role="dialog">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h4 class="modal-title" id="updateModalLabel">Setup Subscription</h4>
+                    <h4 class="modal-title">Setup Subscription</h4>
                 </div>
                 <div class="modal-body">
                     <p ng-show="config.update.box">
@@ -183,11 +133,6 @@
 
                 <div class="collapse navbar-collapse">
                     <ul class="nav navbar-nav navbar-right" ng-hide="hideNavBarActions">
-                        <li ng-show="config.update.box && user.admin">
-                            <a ng-href="" ng-click="showUpdateModal(update_form)" style="cursor: pointer">
-                                <span class="badge badge-success">Update available</span>
-                            </a>
-                        </li>
                         <li ng-show="ready && subscription.plan.id === 'free'">
                             <a ng-href="" ng-click="showSubscriptionModal()" style="cursor: pointer">
                                 <span class="badge badge-success">SETUP SUBSCRIPTION</span>
diff --git a/dashboard/src/js/main.js b/dashboard/src/js/main.js
index cdbb05ed8..6458f1147 100644
--- a/dashboard/src/js/main.js
+++ b/dashboard/src/js/main.js
@@ -13,11 +13,6 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
 
     $scope.hideNavBarActions = $location.path() === '/logs';
 
-    $scope.update = {
-        busy: false,
-        error: {}
-    };
-
     $scope.isActive = function (url) {
         if (!$route.current) return false;
         return $route.current.$$route.originalPath.indexOf(url) === 0;
@@ -75,47 +70,18 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
         $('#setupSubscriptionModal').modal('show');
     };
 
-    $scope.showUpdateModal = function (form) {
-        $scope.update.error.generic = null;
-
-        form.$setPristine();
-        form.$setUntouched();
-
-        if (!$scope.config.update.box.sourceTarballUrl) {
-            $('#setupSubscriptionModal').modal('show');
-        } else {
-            $('#updateModal').modal('show');
-        }
-    };
-
-    $scope.doUpdate = function () {
-        $scope.update.error.generic = null;
-
-        $scope.update.busy = true;
-        Client.update(function (error) {
-            if (error) {
-                if (error.statusCode === 409) {
-                    $scope.update.error.generic = 'Please try again later. The Cloudron is creating a backup at the moment.';
-                } else {
-                    $scope.update.error.generic = error.message;
-                    console.error('Unable to update.', error);
-                }
-                $scope.update.busy = false;
-                return;
-            }
-
-            window.location.href = '/update.html';
-        });
-    };
-
     function runConfigurationChecks() {
-        var actionScope;
-
         // warn user if dns config is not working (the 'configuring' flag detects if configureWebadmin is 'active')
         if (!$scope.status.webadminStatus.configuring && !$scope.status.webadminStatus.dns) {
-            actionScope = $scope.$new(true);
-            actionScope.action = '/#/certs';
-            Client.notify('Invalid Domain Config', 'Unable to update DNS. Click here to update it.', true, 'error', actionScope);
+            var dnsActionScope = $scope.$new(true);
+            dnsActionScope.action = '/#/certs';
+            Client.notify('Invalid Domain Config', 'Unable to update DNS. Click here to update it.', true, 'error', dnsActionScope);
+        }
+
+        if ($scope.config.update && $scope.config.update.box) {
+            var updateActionScope = $scope.$new(true);
+            updateActionScope.action = '/#/settings';
+            Client.notify('Update Available', 'Update now to version ' + $scope.config.update.box.version + '.', true, 'success', updateActionScope);
         }
 
         Client.getBackupConfig(function (error, backupConfig) {