diff --git a/masquerade.module b/masquerade.module
index 1d79acf..3feea3b 100644
--- a/masquerade.module
+++ b/masquerade.module
@@ -262,7 +262,7 @@ function masquerade_switch_user_validate(UserInterface $target_account) {
   }
   if (\Drupal::config('system.maintenance')->get('enabled') && !$target_account->hasPermission('access site in maintenance mode')) {
     return t('@user is not permitted to %permission. <a href=":maintenance-url">Disable maintenance mode</a> to masquerade as @user.', array(
-      '%user' => $target_account->getDisplayName(),
+      '@user' => $target_account->getDisplayName(),
       '%permission' => t('Use the site in maintenance mode'),
       ':maintenance-url' => Url::fromRoute('system.site_maintenance_mode')->toString(),
     ));
diff --git a/tests/src/Functional/MasqueradeWebTestBase.php b/tests/src/Functional/MasqueradeWebTestBase.php
index edc99e9..7de62a4 100644
--- a/tests/src/Functional/MasqueradeWebTestBase.php
+++ b/tests/src/Functional/MasqueradeWebTestBase.php
@@ -139,8 +139,8 @@ abstract class MasqueradeWebTestBase extends BrowserTestBase {
     // Update the logged in user account.
     // @see \Drupal\Tests\BrowserTestBase::drupalLogin()
     if (isset($this->session_id)) {
-      $this->loggedInUser = $account;
-      $this->loggedInUser->session_id = $this->session_id;
+      //$this->loggedInUser = $account;
+      //$this->loggedInUser->session_id = $this->session_id;
     }
   }
 
@@ -163,8 +163,8 @@ abstract class MasqueradeWebTestBase extends BrowserTestBase {
     // Update the logged in user account.
     // @see \Drupal\Tests\BrowserTestBase::drupalLogin()
     if (isset($this->session_id)) {
-      $this->loggedInUser = $account;
-      $this->loggedInUser->session_id = $this->session_id;
+      //$this->loggedInUser = $account;
+      //$this->loggedInUser->session_id = $this->session_id;
     }
   }