diff --git a/core/modules/user/src/Form/UserLoginForm.php b/core/modules/user/src/Form/UserLoginForm.php
index d2780de747a90baf958fde632f7a35f429c4d688..163030ce25157e9a331c8bbb7e8b4ca883e3ba65 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 2c29d664cd6aa4051f564bba987b4fe46f038be0..93ef0e6bbdf4f4d9d30677246c868555410c7e7c 100644
--- a/core/modules/user/src/Form/UserPasswordForm.php
+++ b/core/modules/user/src/Form/UserPasswordForm.php
@@ -8,6 +8,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\Core\TypedData\TypedDataManagerInterface;
@@ -23,7 +24,7 @@
  *
  * @internal
  */
-class UserPasswordForm extends FormBase {
+class UserPasswordForm extends FormBase implements WorkspaceSafeFormInterface {
 
   use DeprecatedServicePropertyTrait;
 
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}