diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index 9814c48ab7..9a7c69124d 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -116,9 +116,6 @@ class AccountSettingsNav extends Widget
                     'emailsettings' =>
                     array(_('Email'),
                           _('Change email handling')),
-                    'openidsettings' =>
-                    array(_('OpenID'),
-                          _('Add or remove OpenIDs')),
                     'userdesignsettings' =>
                     array(_('Design'),
                           _('Design your profile')),
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index b70b1da190..f76fe1e3c0 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -87,4 +87,16 @@ class OpenIDPlugin extends Plugin
 
         return true;
     }
+
+    function onEndAccountSettingsNav(&$action)
+    {
+        $action_name = $action->trimmed('action');
+
+        $action->menuItem(common_local_url('openidsettings'),
+                          _('OpenID'),
+                          _('Add or remove OpenIDs'),
+                          $action_name === 'openidsettings');
+
+        return true;
+    }
 }
\ No newline at end of file