diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index eb6b1e3fc..45a2240c1 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -619,10 +619,12 @@ const UserMenuButton = new Lang.Class({
 
     _updateLogout: function() {
         let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
+        let systemAccount = this._user.system_account;
+        let localAccount = this._user.local_account;
         let multiUser = this._userManager.has_multiple_users;
         let multiSession = Gdm.get_session_ids().length > 1;
 
-        this._logoutItem.actor.visible = allowLogout && (multiUser || multiSession);
+        this._logoutItem.actor.visible = allowLogout && (multiUser || multiSession || systemAccount || !localAccount);
     },
 
     _updateLockScreen: function() {