diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index bae45b0770..59f3133025 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -87,11 +87,6 @@ class LoginGroupNav extends Widget
                                         $action_name === 'register');
             }
 
-            $this->action->menuItem(common_local_url('openidlogin'),
-                                    _('OpenID'),
-                                    _('Login or register with OpenID'),
-                                    $action_name === 'openidlogin');
-
             Event::handle('EndLoginGroupNav', array(&$this->action));
         }
 
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 149a92356d..b70b1da190 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -75,4 +75,16 @@ class OpenIDPlugin extends Plugin
 
         return true;
     }
+
+    function onEndLoginGroupNav(&$action)
+    {
+        $action_name = $action->trimmed('action');
+
+        $action->menuItem(common_local_url('openidlogin'),
+                          _('OpenID'),
+                          _('Login or register with OpenID'),
+                          $action_name === 'openidlogin');
+
+        return true;
+    }
 }
\ No newline at end of file