diff --git a/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override
index d5b82b3..20515fc 100644
--- a/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override
+++ b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override
@@ -9,8 +9,10 @@ picture-uri='file:///usr/share/backgrounds/gnome/Icescape.jpg'
 picture-uri='file:////usr/share/gnome-control-center/pixmaps/noise-texture-light.png'
 color-shading-type='solid'
 primary-color='#425265'
+user-switch-enabled=false
 
-
+[org.gnome.desktop.lockdown]
+disable-user-switching=true
 
 [org.gnome.desktop.wm.preferences]
 theme='Adapta-Eta'
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Patch-gnome-shell-to-disable-logging-out.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Patch-gnome-shell-to-disable-logging-out.patch
new file mode 100644
index 0000000..465669e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Patch-gnome-shell-to-disable-logging-out.patch
@@ -0,0 +1,24 @@
+From 3fb6b84dc41a0c4abfa5b493635ee6a2c4abd0f8 Mon Sep 17 00:00:00 2001
+From: David McKinney <mckinney@subgraph.com>
+Date: Sun, 14 Apr 2019 18:57:03 +0000
+Subject: [PATCH] Patch gnome-shell to disable logging out
+
+---
+ js/misc/systemActions.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js
+index aa79bfe..4036783 100644
+--- a/js/misc/systemActions.js
++++ b/js/misc/systemActions.js
+@@ -361,8 +361,8 @@ const SystemActions = GObject.registerClass({
+ 
+     _updateLogout() {
+         let user = this._userManager.get_user(GLib.get_user_name());
+-
+-        let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
++        // Disable allowLogout globally in gnome-shell
++        let allowLogout = false;
+         let alwaysShow = global.settings.get_boolean(ALWAYS_SHOW_LOG_OUT_KEY);
+         let systemAccount = user.system_account;
+         let localAccount = user.local_account;
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.32.0.bb
index e7de770..9188a18 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.32.0.bb
@@ -12,6 +12,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}
            file://0001-Disabled-calendar-events-from-user-session.patch \
            file://0001-do-not-use-python-path-from-build-environment.patch \
            file://0001-do-not-build-calendar-server.patch \
+           file://0001-Patch-gnome-shell-to-disable-logging-out.patch \
            "
 
 DEPENDS = "glib-2.0-native systemd libcanberra gtk+3 glib-2.0 libxml2 libcroco mutter libsoup-2.4 gsettings-desktop-schemas gcr atk polkit startup-notification libx11 gnome-bluetooth libsecret networkmanager gjs mozjs network-manager-applet pulseaudio libxml2-native paxctl-native ibus xmlto-native sassc-native"