diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index d47265e..d94d500 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -634,12 +634,12 @@ function user_cancel_url(UserInterface $account, $options = array()) {
  */
 function user_pass_rehash(UserInterface $account, $timestamp) {
   // Build $data to include unique elements in this token.
-  $data = $timestamp .
-    $account->getLastLoginTime() .
-    $account->id() .
-    $account->getEmail();
-  $key = Settings::getHashSalt() .
-    $account->getPassword();
+  $data = $timestamp;
+  $data .= $account->getLastLoginTime();
+  $data .= $account->id();
+  $data .= $account->getEmail();
+  $key = Settings::getHashSalt();
+  $key .= $account->getPassword();
   return Crypt::hmacBase64($data, $key);
 }