diff --git a/angular/src/components/login.component.ts b/angular/src/components/login.component.ts
index a77eb724ac..3210c0d1bc 100644
--- a/angular/src/components/login.component.ts
+++ b/angular/src/components/login.component.ts
@@ -65,11 +65,11 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
         if (Utils.isBrowser && !Utils.isNode) {
             this.focusInput();
         }
-
-        this.setupCaptcha();
     }
 
     async submit() {
+        await this.setupCaptcha();
+
         if (this.email == null || this.email === '') {
             this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'),
                 this.i18nService.t('emailRequired'));