diff --git a/plugins/OpenID/actions/openidsettings.php b/plugins/OpenID/actions/openidsettings.php
index 75835ff1f1..9651ec3134 100644
--- a/plugins/OpenID/actions/openidsettings.php
+++ b/plugins/OpenID/actions/openidsettings.php
@@ -287,7 +287,7 @@ class OpenidsettingsAction extends SettingsAction
             // TRANS: Form validation error for a non-existing OpenID.
             throw new ClientException(_m('No such OpenID.'));
         }
-        if ($this->scoped->getID() !== $oid->getID()) {
+        if ($this->scoped->getID() != $oid->user_id) {
             // TRANS: Form validation error if OpenID is connected to another user.
             throw new ClientException(_m('That OpenID does not belong to you.'));
         }
diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php
index c96248ad0f..25811d88b2 100644
--- a/plugins/OpenID/openid.php
+++ b/plugins/OpenID/openid.php
@@ -131,6 +131,7 @@ function oid_check_immediate($openid_url, $backto=null)
 
 function oid_authenticate($openid_url, $returnto, $immediate=false)
 {
+    $openid_url = Auth_OpenID::normalizeUrl($openid_url);
     if (!common_valid_http_url($openid_url)) {
         throw new ClientException(_m('No valid URL provided for OpenID.'));
     }