diff --git a/src/Controller/UserSettingsController.php b/src/Controller/UserSettingsController.php
index ea49dbc2..89a0ef7c 100644
--- a/src/Controller/UserSettingsController.php
+++ b/src/Controller/UserSettingsController.php
@@ -331,7 +331,7 @@ class UserSettingsController extends AbstractController
         $google_form->handleRequest($request);
 
         //We do not need to check for validity of the google form here, because we do not care if the other fields are valid
-        if (!$this->demo_mode && !$user->isSamlUser() && $google_form->isSubmitted()) {
+        if (!$this->demo_mode && !$user->isSamlUser() && $google_form->isSubmitted() && $google_form->isValid()) {
             if (!$google_enabled) {
                 //Save 2FA settings (save secrets)
                 $user->setGoogleAuthenticatorSecret($google_form->get('googleAuthenticatorSecret')->getData());
diff --git a/src/Form/TFAGoogleSettingsType.php b/src/Form/TFAGoogleSettingsType.php
index e00ba494..aaa93e9e 100644
--- a/src/Form/TFAGoogleSettingsType.php
+++ b/src/Form/TFAGoogleSettingsType.php
@@ -60,7 +60,7 @@ class TFAGoogleSettingsType extends AbstractType
                             'pattern' => '\d*',
                             'autocomplete' => 'off',
                         ],
-                        'constraints' => [new ValidGoogleAuthCode()],
+                        'constraints' => [new ValidGoogleAuthCode(groups: ["google_authenticator"])],
                     ]
                 );
 
@@ -92,6 +92,7 @@ class TFAGoogleSettingsType extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => User::class,
+            'validation_groups' => ['google_authenticator'],
         ]);
     }
 }