Index: modules/openid/openid.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.js,v
retrieving revision 1.6
diff -u -p -r1.6 openid.js
--- modules/openid/openid.js	30 Jan 2008 22:11:22 -0000	1.6
+++ modules/openid/openid.js	10 Feb 2008 21:03:48 -0000
@@ -1,7 +1,7 @@
 // $Id: openid.js,v 1.6 2008/01/30 22:11:22 goba Exp $
 
 Drupal.behaviors.openid = function (context) {
-  var $loginElements = $("#edit-name-wrapper, #edit-pass-wrapper, li.openid-link");
+  var $loginElements = $("#user-login-form #edit-name-wrapper, #user-login-form #edit-pass-wrapper, li.openid-link");
   var $openidElements = $("#edit-openid-identifier-wrapper, li.user-link");
 
   // This behavior attaches by ID, so is only valid once on a page.
@@ -17,7 +17,7 @@ Drupal.behaviors.openid = function (cont
        $loginElements.hide();
        $openidElements.css("display", "block");
       // Remove possible error message.
-      $("#edit-name, #edit-pass").removeClass("error");
+      $("#user-login-form #edit-name, #user-login-form #edit-pass").removeClass("error");
       $("div.messages.error").hide();
       // Set focus on OpenID Identifier field.
       $("#edit-openid-identifier")[0].focus();
@@ -32,7 +32,7 @@ Drupal.behaviors.openid = function (cont
       $("#edit-openid-identifier").val('').removeClass("error");
       $("div.messages.error").css("display", "block");
       // Set focus on username field.
-      $("#edit-name")[0].focus();
+      $("#user-login-form #edit-name")[0].focus();
       return false;
     });
 };