diff --git a/system/autoload/User.php b/system/autoload/User.php
index 1e5c7436..c8b09197 100644
--- a/system/autoload/User.php
+++ b/system/autoload/User.php
@@ -161,8 +161,11 @@ class User
     {
         global $config;
         if ($config['maintenance_mode'] == true) {
-            displayMaintenanceMessage();
-            // r2(U . 'logout', 'd', '');
+            if ($config['maintenance_mode_logout'] == true) {
+                r2(U . 'logout', 'd', '');
+            } else {
+                displayMaintenanceMessage();
+            }
         }
         if (!$id) {
             $id = User::getID();
diff --git a/system/controllers/settings.php b/system/controllers/settings.php
index c05d1ab2..83fcd41e 100644
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@@ -775,10 +775,12 @@ switch ($action) {
         }
         if (_post('save') == 'save') {
             $status = isset($_POST['maintenance_mode']) ? 1 : 0; // Checkbox returns 1 if checked, otherwise 0
+            $force_logout = isset($_POST['maintenance_mode_logout']) ? 1 : 0; // Checkbox returns 1 if checked, otherwise 0
             $date = isset($_POST['maintenance_date']) ? $_POST['maintenance_date'] : null;
 
             $settings = [
                 'maintenance_mode' => $status,
+                'maintenance_mode_logout' => $force_logout,
                 'maintenance_date' => $date
             ];
 
diff --git a/ui/ui/maintenance-mode.tpl b/ui/ui/maintenance-mode.tpl
index 860bd5ec..3a9fed10 100644
--- a/ui/ui/maintenance-mode.tpl
+++ b/ui/ui/maintenance-mode.tpl
@@ -74,6 +74,16 @@
                             </label>
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Force Logout:')}</label>
+                        <div class="col-md-6">
+                            <label class="switch">
+                                <input type="checkbox" id="maintenance_mode_logout" value="1"
+                                    name="maintenance_mode_logout" {if $_c['maintenance_mode_logout']==1}checked{/if}>
+                                <span class="slider"></span>
+                            </label>
+                        </div>
+                    </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('End Date:')}</label>
                         <div class="col-md-6">