diff --git a/console/src/app/components/feature-toggle/login-v2-feature-toggle/login-v2-feature-toggle.component.html b/console/src/app/components/feature-toggle/login-v2-feature-toggle/login-v2-feature-toggle.component.html
index c1feeb894..5dc42f0d3 100644
--- a/console/src/app/components/feature-toggle/login-v2-feature-toggle/login-v2-feature-toggle.component.html
+++ b/console/src/app/components/feature-toggle/login-v2-feature-toggle/login-v2-feature-toggle.component.html
@@ -1,27 +1,29 @@
-<cnsl-feature-toggle
-  *ngIf="toggleState$ | async as toggleState"
-  toggleStateKey="loginV2"
-  [toggleState]="toggleState"
-  (toggleChange)="toggleState$.next($event); !$event.enabled && toggleChanged.emit($event)"
->
-  <cnsl-form-field *ngIf="toggleState.enabled">
-    <cnsl-label>{{ 'SETTING.FEATURES.LOGINV2_BASEURI' | translate }}</cnsl-label>
-    <input cnslInput [formControl]="baseUri" />
-    <button
-      matTooltip="{{ 'ACTIONS.SAVE' | translate }}"
-      mat-icon-button
-      [disabled]="baseUri.invalid"
-      color="primary"
-      type="submit"
-      (click)="
-        toggleChanged.emit({
-          source: toggleState.source,
-          enabled: toggleState.enabled,
-          baseUri: baseUri.value,
-        })
-      "
-    >
-      <i class="las la-save"></i>
-    </button>
-  </cnsl-form-field>
-</cnsl-feature-toggle>
+@if (toggleState$ | async; as toggleState) {
+  <cnsl-feature-toggle
+    toggleStateKey="loginV2"
+    [toggleState]="toggleState"
+    (toggleChange)="toggleState$.next($event); !$event.enabled && toggleChanged.emit($event)"
+  >
+    @if (toggleState.enabled) {
+      <cnsl-form-field>
+        <cnsl-label>{{ 'SETTING.FEATURES.LOGINV2_BASEURI' | translate }}</cnsl-label>
+        <input cnslInput [formControl]="baseUri" />
+        <button
+          matTooltip="{{ 'ACTIONS.SAVE' | translate }}"
+          mat-icon-button
+          color="primary"
+          type="submit"
+          (click)="
+            toggleChanged.emit({
+              source: toggleState.source,
+              enabled: toggleState.enabled,
+              baseUri: baseUri.value,
+            })
+          "
+        >
+          <i class="las la-save"></i>
+        </button>
+      </cnsl-form-field>
+    }
+  </cnsl-feature-toggle>
+}
diff --git a/console/src/app/components/feature-toggle/login-v2-feature-toggle/login-v2-feature-toggle.component.ts b/console/src/app/components/feature-toggle/login-v2-feature-toggle/login-v2-feature-toggle.component.ts
index 32ffe46e5..d053b92e6 100644
--- a/console/src/app/components/feature-toggle/login-v2-feature-toggle/login-v2-feature-toggle.component.ts
+++ b/console/src/app/components/feature-toggle/login-v2-feature-toggle/login-v2-feature-toggle.component.ts
@@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, Component, DestroyRef, EventEmitter, Input, Ou
 import { FeatureToggleComponent } from '../feature-toggle.component';
 import { ToggleStates } from 'src/app/components/features/features.component';
 import { distinctUntilKeyChanged, ReplaySubject } from 'rxjs';
-import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms';
-import { AsyncPipe, NgIf } from '@angular/common';
+import { FormControl, ReactiveFormsModule } from '@angular/forms';
+import { AsyncPipe } from '@angular/common';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { InputModule } from 'src/app/modules/input/input.module';
 import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
@@ -17,7 +17,6 @@ import { MatTooltipModule } from '@angular/material/tooltip';
   imports: [
     FeatureToggleComponent,
     AsyncPipe,
-    NgIf,
     ReactiveFormsModule,
     InputModule,
     HasRolePipeModule,
@@ -36,7 +35,7 @@ export class LoginV2FeatureToggleComponent {
   public toggleChanged = new EventEmitter<ToggleStates['loginV2']>();
 
   protected readonly toggleState$ = new ReplaySubject<ToggleStates['loginV2']>(1);
-  protected readonly baseUri = new FormControl('', { nonNullable: true, validators: [Validators.required] });
+  protected readonly baseUri = new FormControl('', { nonNullable: true });
 
   constructor(destroyRef: DestroyRef) {
     this.toggleState$.pipe(distinctUntilKeyChanged('baseUri'), takeUntilDestroyed(destroyRef)).subscribe(({ baseUri }) => {