diff --git a/ui-ngx/src/app/modules/login/login.module.ts b/ui-ngx/src/app/modules/login/login.module.ts
index a7d8731f9d..35dbfad7e2 100644
--- a/ui-ngx/src/app/modules/login/login.module.ts
+++ b/ui-ngx/src/app/modules/login/login.module.ts
@@ -25,7 +25,6 @@ import { ResetPasswordComponent } from '@modules/login/pages/login/reset-passwor
 import { CreatePasswordComponent } from '@modules/login/pages/login/create-password.component';
 import { TwoFactorAuthLoginComponent } from '@modules/login/pages/login/two-factor-auth-login.component';
 import { LinkExpiredComponent } from '@modules/login/pages/login/link-expired.component';
-import { PasswordRequirementsTooltipComponent } from '@modules/login/pages/login/password-requirements-tooltip.component';
 
 @NgModule({
   declarations: [
@@ -34,8 +33,7 @@ import { PasswordRequirementsTooltipComponent } from '@modules/login/pages/login
     ResetPasswordComponent,
     CreatePasswordComponent,
     TwoFactorAuthLoginComponent,
-    LinkExpiredComponent,
-    PasswordRequirementsTooltipComponent
+    LinkExpiredComponent
   ],
   imports: [
     CommonModule,
diff --git a/ui-ngx/src/app/modules/login/pages/login/password-requirements-tooltip.component.html b/ui-ngx/src/app/shared/components/password-requirements-tooltip.component.html
similarity index 100%
rename from ui-ngx/src/app/modules/login/pages/login/password-requirements-tooltip.component.html
rename to ui-ngx/src/app/shared/components/password-requirements-tooltip.component.html
diff --git a/ui-ngx/src/app/modules/login/pages/login/password-requirements-tooltip.component.scss b/ui-ngx/src/app/shared/components/password-requirements-tooltip.component.scss
similarity index 100%
rename from ui-ngx/src/app/modules/login/pages/login/password-requirements-tooltip.component.scss
rename to ui-ngx/src/app/shared/components/password-requirements-tooltip.component.scss
diff --git a/ui-ngx/src/app/modules/login/pages/login/password-requirements-tooltip.component.ts b/ui-ngx/src/app/shared/components/password-requirements-tooltip.component.ts
similarity index 100%
rename from ui-ngx/src/app/modules/login/pages/login/password-requirements-tooltip.component.ts
rename to ui-ngx/src/app/shared/components/password-requirements-tooltip.component.ts
diff --git a/ui-ngx/src/app/shared/shared.module.ts b/ui-ngx/src/app/shared/shared.module.ts
index 9fd6e4a71e..c69776ef1d 100644
--- a/ui-ngx/src/app/shared/shared.module.ts
+++ b/ui-ngx/src/app/shared/shared.module.ts
@@ -228,6 +228,7 @@ import { JsFuncModuleRowComponent } from '@shared/components/js-func-module-row.
 import { EntityKeyAutocompleteComponent } from '@shared/components/entity/entity-key-autocomplete.component';
 import { DurationLeftPipe } from '@shared/pipe/duration-left.pipe';
 import { MqttVersionSelectComponent } from '@shared/components/mqtt-version-select.component';
+import { PasswordRequirementsTooltipComponent } from '@shared/components/password-requirements-tooltip.component';
 
 export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService) {
   return markedOptionsService;
@@ -443,6 +444,7 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
     ScadaSymbolInputComponent,
     EntityKeyAutocompleteComponent,
     MqttVersionSelectComponent,
+    PasswordRequirementsTooltipComponent
   ],
   imports: [
     CommonModule,
@@ -707,6 +709,7 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
     ScadaSymbolInputComponent,
     EntityKeyAutocompleteComponent,
     MqttVersionSelectComponent,
+    PasswordRequirementsTooltipComponent
   ]
 })
 export class SharedModule { }