diff --git a/core/modules/openid/openid-rtl.css b/core/modules/openid/openid-rtl.css
index 8eecb7e..5b5d662 100644
--- a/core/modules/openid/openid-rtl.css
+++ b/core/modules/openid/openid-rtl.css
@@ -1,18 +1,18 @@
 
-#edit-openid-identifier {
+.edit-openid-identifier {
   background-position: right 50%;
   padding-left: 0;
   padding-right: 20px;
 }
-#user-login .openid-links {
+.user-login .openid-links {
   padding-right: 0;
 }
-.js #user-login-form li.openid-link,
-.js #user-login li.openid-link {
+.js .user-login-form li.openid-link,
+.js .user-login li.openid-link {
   margin-right: 0;
 }
-#user-login-form li.openid-link a,
-#user-login li.openid-link a {
+.user-login-form li.openid-link a,
+.user-login li.openid-link a {
   background-position: right top;
   padding: 0 1.5em 0 0;
 }
diff --git a/core/modules/openid/openid.css b/core/modules/openid/openid.css
index 913d496..66f79b8 100644
--- a/core/modules/openid/openid.css
+++ b/core/modules/openid/openid.css
@@ -1,5 +1,5 @@
 
-#edit-openid-identifier {
+.edit-openid-identifier {
   background-image: url("login-bg.png");
   background-position: left 50%; /* LTR */
   background-repeat: no-repeat;
@@ -8,37 +8,37 @@
 div.form-item-openid-identifier {
   display: block;
 }
-.js #user-login-form div.form-item-openid-identifier,
-.js #user-login div.form-item-openid-identifier {
+.js .user-login-form div.form-item-openid-identifier,
+.js .user-login div.form-item-openid-identifier {
   display: none;
 }
-#user-login-form ul {
+.user-login-form ul {
   margin-top: 0;
 }
-#user-login ul {
+.user-login ul {
   margin: 0 0 5px;
 }
-#user-login ul li {
+.user-login ul li {
   margin: 0;
 }
-#user-login-form .openid-links {
+.user-login-form .openid-links {
   padding-bottom: 0;
 }
-#user-login .openid-links {
+.user-login .openid-links {
   padding-left: 0; /* LTR */
 }
-#user-login-form .openid-links li,
-#user-login .openid-links li {
+.user-login-form .openid-links li,
+.user-login .openid-links li {
   display: none;
   list-style: none;
 }
-.js #user-login-form li.openid-link,
-.js #user-login li.openid-link {
+.js .user-login-form li.openid-link,
+.js .user-login li.openid-link {
   display: block;
   margin-left: 0; /* LTR */
 }
-#user-login-form li.openid-link a,
-#user-login li.openid-link a {
+.user-login-form li.openid-link a,
+.user-login li.openid-link a {
   background-image: url("login-bg.png");
   background-position: left top; /* LTR */
   background-repeat: no-repeat;
diff --git a/core/modules/openid/openid.js b/core/modules/openid/openid.js
index 974555c..127722c 100644
--- a/core/modules/openid/openid.js
+++ b/core/modules/openid/openid.js
@@ -11,7 +11,7 @@ Drupal.behaviors.openid = {
 
     // This behavior attaches by ID, so is only valid once on a page.
     if (cookie || location.hash === '#openid-login') {
-      var $edit_openid_identifier = $('#edit-openid-identifier');
+      var $edit_openid_identifier = $('.edit-openid-identifier');
       if (cookie) {
         $edit_openid_identifier.val(cookie);
       }
@@ -32,7 +32,7 @@ Drupal.behaviors.openid = {
         $('#edit-name, #edit-pass').removeClass('error');
         $('div.messages.error').hide();
         // Set focus on OpenID Identifier field.
-        $('#edit-openid-identifier')[0].focus();
+        $('.edit-openid-identifier')[0].focus();
         return false;
       });
     $context.find('li.user-link')
@@ -41,7 +41,7 @@ Drupal.behaviors.openid = {
         openidElements.hide();
         loginElements.css('display', 'block');
         // Clear OpenID Identifier field and remove possible error message.
-        $('#edit-openid-identifier').val('').removeClass('error');
+        $('.edit-openid-identifier').val('').removeClass('error');
         $('div.messages.error').css('display', 'block');
         // Set focus on username field.
         $('#edit-name')[0].focus();