diff --git a/src/index.html b/src/index.html
index 77c999104..dcd978909 100644
--- a/src/index.html
+++ b/src/index.html
@@ -143,7 +143,7 @@
                                 <li ng-show="user.isAtLeastAdmin"><a href="#/settings"><i class="fa fa-wrench fa-fw"></i> Settings</a></li>
                                 <li ng-show="user.isAtLeastAdmin" class="divider"></li>
                                 <li ng-show="user.isAtLeastAdmin"><a href="#/support"><i class="fa fa-comment fa-fw"></i> Support</a></li>
-                                <li ng-show="user.isAtLeastAdmin"><a href="#/system"><i class="fa fa-cogs fa-fw"></i> System Info</a></li>
+                                <li ng-show="user.isAtLeastAdmin"><a href="#/system"><i class="fa fa-cogs fa-fw"></i> System</a></li>
                                 <li class="divider"></li>
                                 <li><a href="" ng-click="logout($event)"><i class="fa fa-sign-out-alt fa-fw"></i> Logout</a></li>
                             </ul>
diff --git a/src/views/notifications.js b/src/views/notifications.js
index b58f299e3..1439cf31a 100644
--- a/src/views/notifications.js
+++ b/src/views/notifications.js
@@ -111,5 +111,5 @@ angular.module('Application').controller('NotificationsController', ['$scope', '
 
     Client.onReconnect(function () {
         $scope.notifications.refresh();
-    })
+    });
 }]);
diff --git a/src/views/system.html b/src/views/system.html
index 1f63d72c2..15111e6cb 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -35,6 +35,24 @@
   </div>
 </div>
 
+<!-- Modal reboot server -->
+<div class="modal fade" id="rebootModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Really reboot server?</h4>
+      </div>
+      <div class="modal-body">
+        <p class="text-warning">Rebooting the server will cause temporary downtime for all apps installed on this Cloudron!</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-danger" ng-click="reboot.submit()" ng-disabled="reboot.busy"><i class="fa fa-circle-notch fa-spin" ng-show="reboot.busy"></i> Reboot now</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <div class="content">
 
   <div class="text-left">
@@ -141,4 +159,28 @@
       </div>
     </div>
   </div>
+
+  <div class="text-left">
+    <h3>Server</h3>
+  </div>
+
+  <div class="card" style="margin-bottom: 15px;">
+    <div class="row">
+      <div class="col-md-12">
+        <p class="text-danger text-bold" ng-show="isRebootRequired">
+          This server requires a reboot to finalize Ubuntu security updates.
+        </p>
+        <p ng-hide="isRebootRequired">
+          Use this only when you experience unexpected behavior. All services and apps will be automatically started.
+        </p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-12 text-right">
+        <a class="btn btn-primary" href="/logs.html?id=box" target="_blank">Show Logs</a>
+        <button class="btn btn-danger" ng-click="reboot.show()" ng-disabled="reboot.busy"><i class="fa fa-circle-notch fa-spin" ng-show="reboot.busy"></i> Reboot</button>
+      </div>
+    </div>
+  </div>
+
 </div>
diff --git a/src/views/system.js b/src/views/system.js
index 3d61122e1..0f778a86f 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -126,6 +126,25 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
         }
     };
 
+    $scope.reboot = {
+        busy: false,
+        show: function () {
+            $scope.reboot.busy = false;
+            $('#rebootModal').modal('show');
+        },
+        submit: function () {
+            $scope.reboot.busy = true;
+
+            Client.reboot(function (error) {
+                if (error) return Client.error(error);
+
+                $('#rebootModal').modal('hide');
+
+                // trigger refetch to show offline banner
+                $timeout(function () { Client.getStatus(function () {}); }, 8000);
+            });
+        }
+    };
 
     function updateDiskGraphs() {
         // https://graphite.readthedocs.io/en/latest/render_api.html#paths-and-wildcards
@@ -232,4 +251,9 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
             });
         });
     });
+
+    Client.onReconnect(function () {
+        $scope.reboot.busy = false;
+    });
+
 }]);