diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
index d457545..dfde951 100644
--- a/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -237,8 +237,8 @@ public function validate(array $form, array &$form_state) {
         form_set_error('name', $error);
       }
       else {
-        // For new registrations, make sure the username does not conflict with an
-        // existing user's email address.
+        // For new registrations, make sure the username does not conflict with
+        // an existing user's email address.
         if (empty($account->uid)) {
           $name_taken = (bool) db_select('users')
             ->fields('users', array('uid'))
@@ -271,8 +271,8 @@ public function validate(array $form, array &$form_state) {
     $mail = $form_state['values']['mail'];
 
     if (!empty($mail)) {
-      // For new registrations, make sure the email address does not conflict with
-      // an existing user's username.
+      // For new registrations, make sure the email address does not conflict
+      // with an existing user's username.
       if (empty($account->uid)) {
         $mail_taken = (bool) db_select('users')
           ->fields('users', array('uid'))
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index 7c1e87e..d9a75ba 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -75,6 +75,7 @@ function user_pass($form, &$form_state) {
       '#value' => t('Cancel'),
       '#name' => 'cancel',
       '#limit_validation_errors' => array(),
+      '#weight' => 5,
     );
   }
   $form['actions']['submit'] = array(