diff --git a/core/modules/user/lib/Drupal/user/Form/UserPasswordResetForm.php b/core/modules/user/lib/Drupal/user/Form/UserPasswordResetForm.php
new file mode 100644
index 0000000..e41d2a9
--- /dev/null
+++ b/core/modules/user/lib/Drupal/user/Form/UserPasswordResetForm.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\user\Form\UserPasswordResetForm.
+ */
+
+namespace Drupal\user\Form;
+
+use Drupal\Core\Controller\ControllerInterface;
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Entity\EntityManager;
+use Drupal\Component\Utility\Crypt;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+
+/**
+ * Form controller for the user password forms.
+ */
+class UserPasswordResetForm implements FormInterface, ControllerInterface {
+
+  /**
+   * Stores the Entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManager
+   */
+  protected $entityManager;
+
+  /**
+   * The user entity storage controller.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageControllerInterface
+   */
+  protected $userStorageController;
+
+  /**
+   * Constructs a UserPasswordResetForm object.
+   *
+   * @param \Drupal\Core\Entity\EntityManager $entity_manager
+   *   The entity manager.
+   */
+  public function __construct(EntityManager $entity_manager) {
+    $this->entityManager = $entity_manager;
+    $this->userStorageController = $entity_manager->getStorageController('user');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static($container->get('plugin.manager.entity'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormID() {
+    return 'user_pass_reset';
+  }
+
+  /**
+   * Menu callback; process one time login link and redirects to the user page on success.
+   */
+  public function buildForm(array $form, array &$form_state, $uid = NULL, $timestamp = NULL, $hashed_pass = NULL, Request $request = NULL, $op = 'confirm') {
+    $user = $request->attributes->get('account');
+
+    // When processing the one-time login link, we have to make sure that a user
+    // isn't already logged in.
+    if ($user->isAuthenticated()) {
+      // The existing user is already logged in.
+      if ($user->id() == $uid) {
+        drupal_set_message(t('You are logged in as %user. <a href="!user_edit">Change your password.</a>', array('%user' => $user->name, '!user_edit' => url("user/" . $user->id() . "/edit"))));
+      }
+      // A different user is already logged in on the computer.
+      else {
+        $reset_link_account = $this->userStorageController->load($uid);
+        if (!empty($reset_link_account)) {
+          drupal_set_message(t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please <a href="!logout">logout</a> and try using the link again.',
+            array('%other_user' => $user->name, '%resetting_user' => $reset_link_account->name, '!logout' => url('user/logout'))));
+        } else {
+          // Invalid one-time link specifies an unknown user.
+          drupal_set_message(t('The one-time login link you clicked is invalid.'));
+        }
+      }
+      return new RedirectResponse(url('<front>', array('absolute' => TRUE)));
+    }
+    else {
+      // Time out, in seconds, until login URL expires.
+      $timeout = config('user.settings')->get('password_reset_timeout');
+      $current = REQUEST_TIME;
+      $account = $this->userStorageController->load($uid);
+      // Verify that the user exists and is active.
+      if ($timestamp <= $current && $account && $account->status) {
+        // No time out for first time login.
+        if ($account->login && $current - $timestamp > $timeout) {
+          drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'));
+          return new RedirectResponse(url('user/password', array('absolute' => TRUE)));
+        }
+        elseif ($account->isAuthenticated() && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
+          // First stage is a confirmation form, then login
+          if ($op == 'login') {
+            // Set the new user.
+            // user_login_finalize() also updates the login timestamp of the
+            // user, which invalidates further use of the one-time login link.
+            user_login_finalize($account);
+            watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp));
+            drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please change your password.'));
+            // Let the user's password be changed without the current password check.
+            $token = Crypt::randomStringHashed(55);
+            $_SESSION['pass_reset_' . $account->id()] = $token;
+            return new RedirectResponse(url('user/' . $account->id() . '/edit', array(
+              'query' => array('pass-reset-token' => $token),
+              'absolute' => TRUE,
+            )));
+          }
+          else {
+            if (!$account->login) {
+              // No expiration for first time login.
+              $form['message'] = array('#markup' => t('<p>This is a one-time login for %user_name.</p><p>Click on this button to log in to the site and change your password.</p>', array('%user_name' => $account->name)));
+            }
+            else {
+              $form['message'] = array('#markup' => t('<p>This is a one-time login for %user_name and will expire on %expiration_date.</p><p>Click on this button to log in to the site and change your password.</p>', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout))));
+            }
+            $form['help'] = array('#markup' => '<p>' . t('This login can be used only once.') . '</p>');
+            $form['actions'] = array('#type' => 'actions');
+            $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
+            $form['#action'] = url("user/reset/$uid/$timestamp/$hashed_pass/login");
+            return $form;
+          }
+        }
+        else {
+          drupal_set_message(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'));
+          return new RedirectResponse(url('user/password', array('absolute' => TRUE)));
+        }
+      }
+      else {
+        // Deny access, no more clues.
+        // Everything will be in the watchdog's URL for the administrator to check.
+        throw new AccessDeniedHttpException();
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, array &$form_state) {}
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, array &$form_state) {}
+
+}
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 924b221..f7f75e5 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -830,11 +830,8 @@ function user_menu() {
   );
   $items['user/reset/%/%/%'] = array(
     'title' => 'Reset password',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('user_pass_reset', 2, 3, 4),
-    'access callback' => TRUE,
+    'route_name' => 'user_pass_reset',
     'type' => MENU_CALLBACK,
-    'file' => 'user.pages.inc',
   );
 
   $items['user/logout'] = array(
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index 6077a27..aec75fe 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -12,89 +12,6 @@
 use Drupal\Component\Utility\Crypt;
 
 /**
- * Menu callback; process one time login link and redirects to the user page on success.
- */
-function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $action = NULL) {
-  global $user;
-
-  // When processing the one-time login link, we have to make sure that a user
-  // isn't already logged in.
-  if ($user->isAuthenticated()) {
-    // The existing user is already logged in.
-    if ($user->id() == $uid) {
-      drupal_set_message(t('You are logged in as %user. <a href="!user_edit">Change your password.</a>', array('%user' => $user->name, '!user_edit' => url("user/" . $user->id() . "/edit"))));
-    }
-    // A different user is already logged in on the computer.
-    else {
-      $reset_link_account = user_load($uid);
-      if (!empty($reset_link_account)) {
-        drupal_set_message(t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please <a href="!logout">logout</a> and try using the link again.',
-          array('%other_user' => $user->name, '%resetting_user' => $reset_link_account->name, '!logout' => url('user/logout'))));
-      } else {
-        // Invalid one-time link specifies an unknown user.
-        drupal_set_message(t('The one-time login link you clicked is invalid.'));
-      }
-    }
-    return new RedirectResponse(url('<front>', array('absolute' => TRUE)));
-  }
-  else {
-    // Time out, in seconds, until login URL expires.
-    $timeout = config('user.settings')->get('password_reset_timeout');
-    $current = REQUEST_TIME;
-    $account = user_load($uid);
-    // Verify that the user exists and is active.
-    if ($timestamp <= $current && $account && $account->status) {
-      // No time out for first time login.
-      if ($account->login && $current - $timestamp > $timeout) {
-        drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'));
-        return new RedirectResponse(url('user/password', array('absolute' => TRUE)));
-      }
-      elseif ($account->isAuthenticated() && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
-        // First stage is a confirmation form, then login
-        if ($action == 'login') {
-          // Set the new user.
-          // user_login_finalize() also updates the login timestamp of the
-          // user, which invalidates further use of the one-time login link.
-          user_login_finalize($account);
-          watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp));
-          drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please change your password.'));
-          // Let the user's password be changed without the current password check.
-          $token = Crypt::randomStringHashed(55);
-          $_SESSION['pass_reset_' . $user->id()] = $token;
-          return new RedirectResponse(url('user/' . $user->id() . '/edit', array(
-            'query' => array('pass-reset-token' => $token),
-            'absolute' => TRUE,
-          )));
-        }
-        else {
-          if (!$account->login) {
-            // No expiration for first time login.
-            $form['message'] = array('#markup' => t('<p>This is a one-time login for %user_name.</p><p>Click on this button to log in to the site and change your password.</p>', array('%user_name' => $account->name)));
-          }
-          else {
-            $form['message'] = array('#markup' => t('<p>This is a one-time login for %user_name and will expire on %expiration_date.</p><p>Click on this button to log in to the site and change your password.</p>', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout))));
-          }
-          $form['help'] = array('#markup' => '<p>' . t('This login can be used only once.') . '</p>');
-          $form['actions'] = array('#type' => 'actions');
-          $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
-          $form['#action'] = url("user/reset/$uid/$timestamp/$hashed_pass/login");
-          return $form;
-        }
-      }
-      else {
-        drupal_set_message(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'));
-        return new RedirectResponse(url('user/password', array('absolute' => TRUE)));
-      }
-    }
-    else {
-      // Deny access, no more clues.
-      // Everything will be in the watchdog's URL for the administrator to check.
-      throw new AccessDeniedHttpException();
-    }
-  }
-}
-
-/**
  * Prepares variables for user templates.
  *
  * Default template: user.html.twig.
diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml
index 10ec95d..b1f0f9c 100644
--- a/core/modules/user/user.routing.yml
+++ b/core/modules/user/user.routing.yml
@@ -75,6 +75,14 @@ user_pass:
   requirements:
     _access: 'TRUE'
 
+user_pass_reset:
+  pattern: '/user/reset/{uid}/{timestamp}/{hashed_pass}/{op}'
+  defaults:
+    _form: '\Drupal\user\Form\UserPasswordResetForm'
+    op: 'confirm'
+  requirements:
+    _access: 'TRUE'
+
 user_page:
   pattern: '/user'
   defaults: