diff --git a/src/Surfnet/StepupRa/RaBundle/Form/Type/StartVettingProcedureType.php b/src/Surfnet/StepupRa/RaBundle/Form/Type/StartVettingProcedureType.php
index a19136aa..a1c36b50 100644
--- a/src/Surfnet/StepupRa/RaBundle/Form/Type/StartVettingProcedureType.php
+++ b/src/Surfnet/StepupRa/RaBundle/Form/Type/StartVettingProcedureType.php
@@ -36,6 +36,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'autocomplete' => 'off',
                 'placeholder' => 'ra.form.start_vetting_procedure.enter_activation_code_here',
                 'class' => 'fa-search',
+                'pattern' => '[a-z0-9]{8}',
             )
         ]);
         $builder->add('search', SubmitType::class, [
diff --git a/src/Surfnet/StepupRa/RaBundle/Form/Type/VerifyIdentityType.php b/src/Surfnet/StepupRa/RaBundle/Form/Type/VerifyIdentityType.php
index bd7927a7..992b3fd0 100644
--- a/src/Surfnet/StepupRa/RaBundle/Form/Type/VerifyIdentityType.php
+++ b/src/Surfnet/StepupRa/RaBundle/Form/Type/VerifyIdentityType.php
@@ -35,7 +35,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'autofocus' => true,
                 'autocomplete' => 'off',
                 'maxlength' => 6,
-                'novalidate' => true,
+                'required' => true,
+                'pattern' => '[a-z0-9-]{6}',
             ]
         ]);
         $builder->add('identityVerified', CheckboxType::class, [