diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 14e1ff1f8..082c0f632 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -48,6 +48,7 @@ const _modes = {
 
     'lock-screen': {
         isLocked: true,
+        isGreeter: undefined,
         unlockDialog: undefined,
         components: ['networkAgent', 'polkitAgent', 'telepathyClient'],
         panel: {
diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index bb3e1a5d9..fcac6cdb7 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -577,6 +577,8 @@ const UserMenuButton = new Lang.Class({
     },
 
     _sessionUpdated: function() {
+        this.actor.visible = !Main.sessionMode.isGreeter;
+
         let allowSettings = Main.sessionMode.allowSettings;
         this._statusChooser.setSensitive(allowSettings);
         this._systemSettings.visible = allowSettings;