diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index ebbc93b95e..9cef832ca6 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -198,6 +198,9 @@ class LoginController extends Controller
         if ('remote_user_guard' === $authGuard && '' !== $logoutUri) {
             return redirect($logoutUri);
         }
+        if ('remote_user_guard' === $authGuard && '' === $logoutUri) {
+            session()->flash('error',trans('firefly.cant_logout_guard'));
+        }
 
         $this->guard()->logout();
 
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index e54531f614..6a7e54cd32 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -62,6 +62,13 @@ abstract class Controller extends BaseController
         app('view')->share('DEMO_PASSWORD', config('firefly.demo_password'));
         app('view')->share('FF_VERSION', config('firefly.version'));
 
+        // share custom auth guard info.
+        $authGuard = config('firefly.authentication_guard');
+        $logoutUri = config('firefly.custom_logout_uri');
+
+        app('view')->share('authGuard', $authGuard);
+        app('view')->share('logoutUri', $logoutUri);
+
         // upload size
         $maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize'));
         $maxPostSize = app('steam')->phpBytes(ini_get('post_max_size'));
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index c785e2f0e2..6acfe20e45 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -233,6 +233,7 @@ return [
     'all_destination_accounts'                            => 'Destination accounts',
     'all_source_accounts'                                 => 'Source accounts',
     'back_to_index'                                       => 'Back to the index',
+    'cant_logout_guard'                                   => 'Firefly III can\'t log you out.',
 
     // check for updates:
     'update_check_title'                                  => 'Check for updates',
diff --git a/resources/views/v1/partials/menu-sidebar.twig b/resources/views/v1/partials/menu-sidebar.twig
index e0f141298f..cd0f1b05d7 100644
--- a/resources/views/v1/partials/menu-sidebar.twig
+++ b/resources/views/v1/partials/menu-sidebar.twig
@@ -212,11 +212,12 @@
       {% endif %}
     </ul>
   </li>
-
+  {% if 'remote_user_guard' != authGuard or '' != logoutUri %}
     <li>
       <a href="{{ route('logout') }}">
         <i class="fa fa-sign-out fa-fw"></i>
         <span>{{ 'logout'|_ }}</span>
       </a>
     </li>
+  {% endif %}
 </ul>