Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.103
diff -u -p -r1.103 contact.module
--- modules/contact/contact.module	16 Jan 2008 12:46:52 -0000	1.103
+++ modules/contact/contact.module	13 Feb 2008 18:39:11 -0000
@@ -166,7 +166,7 @@ function contact_mail($key, &$message, $
     case 'page_copy':
       $contact = $params['contact'];
       $message['subject'] .= t('[!category] !subject', array('!category' => $contact['category'], '!subject' => $params['subject']), $language->language);
-      $message['body'][] = t("!name sent a message using the contact form at !form.", array('!name' => $params['name'], '!form' => url($_GET['q'], array('absolute' => TRUE, 'language' => $language))), $language->language);
+      $message['body'][] = t("!name sent a message using the contact form at !form.", array('!name' => $params['sender'], '!form' => url($_GET['q'], array('absolute' => TRUE, 'language' => $language))), $language->language);
       $message['body'][] = $params['message'];
       break;
     case 'page_autoreply':
Index: modules/contact/contact.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v
retrieving revision 1.6.2.1
diff -u -p -r1.6.2.1 contact.pages.inc
--- modules/contact/contact.pages.inc	12 Feb 2008 14:42:50 -0000	1.6.2.1
+++ modules/contact/contact.pages.inc	13 Feb 2008 18:39:11 -0000
@@ -39,7 +39,7 @@ function contact_mail_page() {
   if (count($categories) > 0) {
     $form['#token'] = $user->uid ? $user->name . $user->mail : '';
     $form['contact_information'] = array('#value' => filter_xss_admin(variable_get('contact_form_information', t('You can leave a message using the contact form below.'))));
-    $form['name'] = array('#type' => 'textfield',
+    $form['sender'] = array('#type' => 'textfield',
       '#title' => t('Your name'),
       '#maxlength' => 255,
       '#default_value' => $user->uid ? $user->name : '',
@@ -143,7 +143,7 @@ function contact_mail_page_submit($form,
   }
 
   flood_register_event('contact');
-  watchdog('mail', '%name-from sent an e-mail regarding %category.', array('%name-from' => $values['name'] ." [$from]", '%category' => $contact['category']));
+  watchdog('mail', '%name-from sent an e-mail regarding %category.', array('%name-from' => $values['sender'] ." [$from]", '%category' => $contact['category']));
   drupal_set_message(t('Your message has been sent.'));
 
   // Jump to home page rather than back to contact page to avoid
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	13 Feb 2008 18:39:11 -0000
@@ -1,7 +1,11 @@
 // $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");
+  // The login form has a different ID for block vs. main page.
+  var prefix = $("#user-login").size() ? "#user-login " : "#user-login-form ";
+  // Attribute selector used due to potential changes in the ID.
+  // The selected objects will have an ID appended with "wrapper".
+  var $loginElements = $(prefix + "div[id^=edit-name-], " + prefix + "div[id^=edit-pass-], 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 +21,7 @@ Drupal.behaviors.openid = function (cont
        $loginElements.hide();
        $openidElements.css("display", "block");
       // Remove possible error message.
-      $("#edit-name, #edit-pass").removeClass("error");
+      $(prefix + "input[name=name], " + prefix + "input[name=pass]").removeClass("error");
       $("div.messages.error").hide();
       // Set focus on OpenID Identifier field.
       $("#edit-openid-identifier")[0].focus();
@@ -32,7 +36,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();
+      $(prefix + "#edit-name")[0].focus();
       return false;
     });
 };