Index: modules/openid/openid.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.js,v
retrieving revision 1.13
diff -u -9 -p -r1.13 openid.js
--- modules/openid/openid.js	22 Mar 2010 18:55:45 -0000	1.13
+++ modules/openid/openid.js	30 Aug 2010 22:34:09 -0000
@@ -1,50 +1,54 @@
 // $Id: openid.js,v 1.13 2010/03/22 18:55:45 dries Exp $
 (function ($) {
 
 Drupal.behaviors.openid = {
   attach: function (context) {
-    var loginElements = $('.form-item-name, .form-item-pass, li.openid-link');
-    var openidElements = $('.form-item-openid-identifier, li.user-link');
+    // Match the forms user-login and user-login-form (the latter is defined in
+    // user_login_block()).
+    var form = $('#user-login, #user-login-form');
+    var loginElements = form.find('.form-item-name, .form-item-pass, li.openid-link');
+    var openidElements = form.find('.form-item-openid-identifier, li.user-link');
+    var openidIdentifier = form.find('input[name="openid_identifier"]');
     var cookie = $.cookie('Drupal.visitor.openid_identifier');
 
     // This behavior attaches by ID, so is only valid once on a page.
-    if (!$('#edit-openid-identifier.openid-processed').size()) {
+    if (!openidIdentifier.filter('.openid-processed').size()) {
       if (cookie) {
-        $('#edit-openid-identifier').val(cookie);
+        openidIdentifier.val(cookie);
       }
-      if ($('#edit-openid-identifier').val()) {
-        $('#edit-openid-identifier').addClass('openid-processed');
+      if (openidIdentifier.val()) {
+        openidIdentifier.addClass('openid-processed');
         loginElements.hide();
         // Use .css('display', 'block') instead of .show() to  Konqueror friendly.
         openidElements.css('display', 'block');
       }
     }
 
     $('li.openid-link:not(.openid-processed)', context)
       .addClass('openid-processed')
       .click(function () {
          loginElements.hide();
          openidElements.css('display', 'block');
         // Remove possible error message.
-        $('#edit-name, #edit-pass').removeClass('error');
+        form.find('input[name="name"], input[name="pass"]').removeClass('error');
         $('div.messages.error').hide();
         // Set focus on OpenID Identifier field.
-        $('#edit-openid-identifier')[0].focus();
+        openidIdentifier.focus();
         return false;
       });
     $('li.user-link:not(.openid-processed)', context)
       .addClass('openid-processed')
       .click(function () {
          openidElements.hide();
          loginElements.css('display', 'block');
         // Clear OpenID Identifier field and remove possible error message.
-        $('#edit-openid-identifier').val('').removeClass('error');
-        $('div.messages.error').css('display', 'block');
+        openidIdentifier.val('').removeClass('error');
+        $('div.messages.error').hide();
         // Set focus on username field.
-        $('#edit-name')[0].focus();
+        form.find('input[name="name"]')[0].focus();
         return false;
       });
   }
 };
 
 })(jQuery);