diff --git a/core/modules/user/src/Form/UserLoginForm.php b/core/modules/user/src/Form/UserLoginForm.php
index 5fe351ede6bbb38efe71b941eee1336a72229f78..b8cbaed6090f425f0b77d1920ebaf7798605aeb8 100644
--- a/core/modules/user/src/Form/UserLoginForm.php
+++ b/core/modules/user/src/Form/UserLoginForm.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Form\WorkspaceSafeFormInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Render\BareHtmlPageRendererInterface;
 use Drupal\Core\Url;
@@ -19,7 +20,7 @@
  *
  * @internal
  */
-class UserLoginForm extends FormBase {
+class UserLoginForm extends FormBase implements WorkspaceSafeFormInterface {
 
   /**
    * The user flood control service.
diff --git a/core/modules/user/src/Form/UserPasswordForm.php b/core/modules/user/src/Form/UserPasswordForm.php
index 01cf30144ff5b4f25c2b1bb445bbc4f7a7533c2b..613ca886f2fb8e9220b265f6feb04577f82fbc34 100644
--- a/core/modules/user/src/Form/UserPasswordForm.php
+++ b/core/modules/user/src/Form/UserPasswordForm.php
@@ -7,6 +7,7 @@
 use Drupal\Core\Flood\FloodInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Form\WorkspaceSafeFormInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Render\Element\Email;
 use Drupal\user\UserInterface;
@@ -21,7 +22,7 @@
  *
  * @internal
  */
-class UserPasswordForm extends FormBase {
+class UserPasswordForm extends FormBase implements WorkspaceSafeFormInterface {
 
   /**
    * The user storage.
diff --git a/core/modules/user/src/Form/UserPasswordResetForm.php b/core/modules/user/src/Form/UserPasswordResetForm.php
index 9dde77d5995f84136bd1c77d4cd15d9399d6644e..bfa88d0c95d6bd7ec87e35643829ede6bf8297b2 100644
--- a/core/modules/user/src/Form/UserPasswordResetForm.php
+++ b/core/modules/user/src/Form/UserPasswordResetForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\user\Form;
 
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Form\WorkspaceSafeFormInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Url;
@@ -14,7 +15,7 @@
  *
  * @internal
  */
-class UserPasswordResetForm extends FormBase {
+class UserPasswordResetForm extends FormBase implements WorkspaceSafeFormInterface {
 
   /**
    * {@inheritdoc}