diff --git a/js/ui/panel.js b/js/ui/panel.js
index d7c8397b5..e90d65beb 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -763,7 +763,6 @@ const PANEL_ITEM_IMPLEMENTATIONS = {
     'appMenu': AppMenuButton,
     'dateMenu': imports.ui.dateMenu.DateMenuButton,
     'a11y': imports.ui.status.accessibility.ATIndicator,
-    'a11yGreeter': imports.ui.status.accessibility.ATGreeterIndicator,
     'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
 };
 
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 707ab3cb7..b7a315e36 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -49,7 +49,7 @@ const _modes = {
         panel: {
             left: [],
             center: ['dateMenu'],
-            right: ['a11yGreeter', 'keyboard', 'aggregateMenu'],
+            right: ['a11y', 'keyboard', 'aggregateMenu']
         },
         panelStyle: 'login-screen'
     },
diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index de76731a1..199126304 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -212,12 +212,3 @@ var ATIndicator = new Lang.Class({
         return widget;
     }
 });
-
-var ATGreeterIndicator = new Lang.Class({
-    Name: 'ATGreeterIndicator',
-    Extends: ATIndicator,
-
-    // Override visibility handling to be always visible
-    _syncMenuVisibility: function() { },
-    _queueSyncMenuVisibility: function() { }
-});