3 files changed, 11 insertions, 10 deletions

diff --git a/client/package.json b/client/package.json
index 22a270c5d..ea33b9fa9 100644
--- a/client/package.json
+++ b/client/package.json
@@ -45,7 +45,7 @@
     "@angular/service-worker": "^11.0.1",
     "@neos21/bootstrap3-glyphicons": "^1.0.1",
     "@ng-bootstrap/ng-bootstrap": "^8.0.0",
-    "@ng-select/ng-select": "^5.0.0",
+    "@ng-select/ng-select": "^5.0.11",
     "@ngx-i18nsupport/ngx-i18nsupport": "^1.1.6",
     "@ngx-i18nsupport/tooling": "^8.0.3",
     "@ngx-loading-bar/core": "^5.0.0",
diff --git a/client/src/app/+login/login.component.ts b/client/src/app/+login/login.component.ts
index 2567f21f1..af747b7fa 100644
--- a/client/src/app/+login/login.component.ts
+++ b/client/src/app/+login/login.component.ts
@@ -71,6 +71,12 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni
   ngOnInit () {
     const snapshot = this.route.snapshot
 
+    // Avoid undefined errors when accessing form error properties
+    this.buildForm({
+      username: LOGIN_USERNAME_VALIDATOR,
+      password: LOGIN_PASSWORD_VALIDATOR
+    })
+
     this.serverConfig = snapshot.data.serverConfig
 
     if (snapshot.queryParams.externalAuthToken) {
@@ -82,11 +88,6 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni
       this.externalAuthError = true
       return
     }
-
-    this.buildForm({
-      username: LOGIN_USERNAME_VALIDATOR,
-      password: LOGIN_PASSWORD_VALIDATOR
-    })
   }
 
   ngAfterViewInit () {
diff --git a/client/yarn.lock b/client/yarn.lock
index a57700986..d27cdaec8 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1160,10 +1160,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@ng-select/ng-select@^5.0.0":
-  version "5.0.9"
-  resolved "https://registry.yarnpkg.com/@ng-select/ng-select/-/ng-select-5.0.9.tgz#3b52b49e04280fdddeacd59e79f381219bd2cf16"
-  integrity sha512-YZeSAiS8/Nx/eHZJPmOOYL8YmcvSq+dr1P8WIrsKmRA7mueorBpPc5xlUj+nLQbpLtsiQvdWDQspf/ykOvD/lA==
+"@ng-select/ng-select@^5.0.11":
+  version "5.0.11"
+  resolved "https://registry.yarnpkg.com/@ng-select/ng-select/-/ng-select-5.0.11.tgz#5068bb7abdca2177ad006b24664865b9761adc11"
+  integrity sha512-D0ZJcdjCAPMgdNTqKoo4kWaYYK99BdqINjqd0QjuUQkl6TSTS3nzEKDHKzdsfP4ZHVkGp+Q3ONUdDv65WK18Rw==
   dependencies:
     tslib "^2.0.0"