diff --git a/src/Controller/AccountController.php b/src/Controller/AccountController.php
index b99ebde6..73d6c15c 100644
--- a/src/Controller/AccountController.php
+++ b/src/Controller/AccountController.php
@@ -40,7 +40,7 @@ public function indexAction(Request $request, TranslatorInterface $translator)
         //change password form
         $form = $this->handleForm(
             $this->createForm(ChangePasswordType::class, $user)
-                ->add('form.change_password', SubmitType::class, ['translation_domain' => 'account', 'label' => 'index.change_password']),
+                ->add('submit', SubmitType::class, ['translation_domain' => 'account', 'label' => 'index.change_password']),
             $request,
             function ($form) use ($user, $translator) {
                 if (
@@ -66,7 +66,7 @@ function ($form) use ($user, $translator) {
             //edit account form
             $form = $this->handleForm(
                 $this->createForm(EditAccountType::class, $user)
-                    ->add('form.save', SubmitType::class, ['translation_domain' => 'common_form', 'label' => 'submit.update']),
+                    ->add('submit', SubmitType::class, ['translation_domain' => 'common_form', 'label' => 'submit.update']),
                 $request,
                 function ($form) use ($user, $translator) {
                     $this->displaySuccess($translator->trans('successful.update', [], 'common_form'));
diff --git a/src/Controller/ContactController.php b/src/Controller/ContactController.php
index 3565dc35..403f574b 100644
--- a/src/Controller/ContactController.php
+++ b/src/Controller/ContactController.php
@@ -49,7 +49,7 @@ public function indexAction(Request $request, TranslatorInterface $translator, E
         //reuse create form logic
         $createForm = function ($contactRequest) {
             return $this->createForm(ContactRequestType::class, $contactRequest)
-                ->add('form.send', SubmitType::class, ['translation_domain' => 'contact', 'label' => 'index.send_mail']);
+                ->add('submit', SubmitType::class, ['translation_domain' => 'contact', 'label' => 'index.send_mail']);
         };
 
         //contact form
diff --git a/src/Controller/InviteController.php b/src/Controller/InviteController.php
index 56b96e25..77e3cbc4 100644
--- a/src/Controller/InviteController.php
+++ b/src/Controller/InviteController.php
@@ -61,7 +61,7 @@ public function doctorAction(Request $request, $guid, TranslatorInterface $trans
         //present set password form
         $form = $this->handleForm(
             $this->createForm(ChangePasswordType::class, $user, ['data_class' => Doctor::class])
-                ->add('form.set_password', SubmitType::class, ['translation_domain' => 'login', 'label' => 'reset.set_password']),
+                ->add('set_password', SubmitType::class, ['translation_domain' => 'login', 'label' => 'reset.set_password']),
             $request,
             function ($form) use ($user, $translator, $request) {
                 //check for valid password
diff --git a/src/Controller/LoginController.php b/src/Controller/LoginController.php
index 4894feee..2fbd178e 100644
--- a/src/Controller/LoginController.php
+++ b/src/Controller/LoginController.php
@@ -127,7 +127,7 @@ public function recoverAction(Request $request, EmailServiceInterface $emailServ
     {
         $form = $this->handleForm(
             $this->createForm(RecoverType::class)
-                ->add('form.recover', SubmitType::class, ['translation_domain' => 'login', 'label' => 'recover.title']),
+                ->add('submit', SubmitType::class, ['translation_domain' => 'login', 'label' => 'recover.title']),
             $request,
             function ($form) use ($emailService, $translator, $logger) {
                 /* @var FormInterface $form */
@@ -197,7 +197,7 @@ public function resetAction(Request $request, $resetHash, TranslatorInterface $t
 
         $form = $this->handleForm(
             $this->createForm(ChangePasswordType::class, $user, ['data_class' => Doctor::class])
-                ->add('form.set_password', SubmitType::class, ['translation_domain' => 'login', 'label' => 'reset.set_password']),
+                ->add('submit', SubmitType::class, ['translation_domain' => 'login', 'label' => 'reset.set_password']),
             $request,
             function ($form) use ($user, $translator, $request) {
                 //check for valid password
@@ -240,7 +240,7 @@ public function requestAction(Request $request, InviteEmailService $emailService
     {
         $form = $this->handleForm(
             $this->createForm(RequestInviteType::class)
-                ->add('form.request_invite', SubmitType::class, ['translation_domain' => 'login', 'label' => 'request.request_invite']),
+                ->add('submit', SubmitType::class, ['translation_domain' => 'login', 'label' => 'request.request_invite']),
             $request,
             function ($form) use ($emailService, $translator) {
                 /* @var FormInterface $form */