diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 0355534d79..91f9ab4c75 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -83,7 +83,7 @@ class OpenidsettingsAction extends SettingsAction {
 				common_element('input', array('type' => 'submit',
 											  'id' => 'remove'.$idx,
 											  'name' => 'remove',
-											  'value' => _t('Add')));
+											  'value' => _t('Remove')));
 				common_element_end('p');
 				common_element_end('form');
 				$idx++;
diff --git a/htaccess.sample b/htaccess.sample
index 92edce2f4c..14da3ba826 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -11,6 +11,7 @@ RewriteRule ^doc/source$ index.php?action=doc&title=source [L,QSA]
 RewriteRule ^main/login$ index.php?action=login [L,QSA]
 RewriteRule ^main/logout$ index.php?action=logout [L,QSA]
 RewriteRule ^main/register$ index.php?action=register [L,QSA]
+RewriteRule ^main/openid$ index.php?action=openidlogin [L,QSA]
 
 RewriteRule ^main/subscribe$ index.php?action=subscribe [L,QSA]
 RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA]
@@ -18,6 +19,7 @@ RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA]
 RewriteRule ^settings/avatar$ index.php?action=avatar [L,QSA]
 RewriteRule ^settings/password$ index.php?action=password [L,QSA]
 RewriteRule ^settings/profile$ index.php?action=profilesettings [L,QSA]
+RewriteRule ^settings/openid$ index.php?action=openidsettings [L,QSA]
 
 RewriteRule ^notice/new$ index.php?action=newnotice [L,QSA]
 RewriteRule ^notice/(\d+)$ index.php?action=shownotice&notice=$1 [L,QSA]
diff --git a/lib/util.php b/lib/util.php
index b78edc93cc..072ab0047b 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -266,6 +266,7 @@ function common_nav_menu() {
 	} else {
 		common_menu_item(common_local_url('login'), _t('Login'));
 		common_menu_item(common_local_url('register'), _t('Register'));
+		common_menu_item(common_local_url('openidlogin'), _t('OpenID'));
 	}
 	common_element_end('ul');
 }
@@ -529,6 +530,8 @@ function common_fancy_url($action, $args=NULL) {
 	 case 'subscribe':
 	 case 'unsubscribe':
 		return common_path('main/'.$action);
+	 case 'openidlogin':
+		return common_path('main/openid');
 	 case 'avatar':
 	 case 'password':
 		return common_path('settings/'.$action);