Index: modules/contact/contact.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v
retrieving revision 1.6
diff -u -p -r1.6 contact.pages.inc
--- modules/contact/contact.pages.inc	16 Jan 2008 22:56:21 -0000	1.6
+++ modules/contact/contact.pages.inc	10 Feb 2008 22:51:14 -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['from-name'] = array('#type' => 'textfield',
       '#title' => t('Your name'),
       '#maxlength' => 255,
       '#default_value' => $user->uid ? $user->name : '',
@@ -120,6 +120,7 @@ function contact_mail_page_submit($form,
   global $language;
 
   $values = $form_state['values'];
+  $values['name'] = $form_state['values']['from-name'];
 
   // E-mail address of the sender: as the form field is a text field,
   // all instances of \r and \n have been automatically stripped from it.
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 22:51:14 -0000
@@ -1,7 +1,14 @@
 // $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. page presentation.
+  if ($("#user-login-form").size()) {
+    $prefix = "#user-login-form ";
+  }
+  else {
+    $prefix = "#user-login ";
+  }
+  var $loginElements = $($prefix + "#edit-name-wrapper, " + $prefix + "#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 +24,7 @@ Drupal.behaviors.openid = function (cont
        $loginElements.hide();
        $openidElements.css("display", "block");
       // Remove possible error message.
-      $("#edit-name, #edit-pass").removeClass("error");
+      $($prefix + "#edit-name-wrapper, " + $prefix + "#edit-pass-wrapper").removeClass("error");
       $("div.messages.error").hide();
       // Set focus on OpenID Identifier field.
       $("#edit-openid-identifier")[0].focus();
@@ -32,7 +39,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;
     });
 };