diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/AuthenticateSafeStoreType.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/AuthenticateSafeStoreType.php
index aea122c8e..9dd0ede00 100644
--- a/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/AuthenticateSafeStoreType.php
+++ b/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/AuthenticateSafeStoreType.php
@@ -32,7 +32,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add('secret', PasswordType::class, [
             'label' => 'ss.form.ss_authenticate_safe_store_type.text.secret',
             'required' => true,
-            'attr' => ['autofocus' => true],
+            'attr' => [
+                'autofocus' => true,
+                'autocomplete' => 'off'
+            ],
         ]);
         $builder->add('verifySecret', SubmitType::class, [
             'label' => 'ss.form.ss_authenticate_safe_store_type.button.continue',
diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/VerifySmsChallengeType.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/VerifySmsChallengeType.php
index add4c97b4..3dcf35bbb 100644
--- a/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/VerifySmsChallengeType.php
+++ b/src/Surfnet/StepupSelfService/SelfServiceBundle/Form/Type/VerifySmsChallengeType.php
@@ -33,7 +33,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add('challenge', TextType::class, [
             'label' => 'ss.form.ss_verify_sms_challenge.text.challenge',
             'required' => true,
-            'attr' => ['autofocus' => true],
+            'attr' => [
+                'autofocus' => true,
+                'autocomplete' => 'off',
+            ],
             'label_attr' => ['class' => 'pull-right'],
         ]);
         $builder->add('resendChallenge', AnchorType::class, [