diff --git a/.github/workflows/angular-prettier.yml b/.github/workflows/angular-format.yml
similarity index 92%
rename from .github/workflows/angular-prettier.yml
rename to .github/workflows/angular-format.yml
index 0e6592790..24a821094 100644
--- a/.github/workflows/angular-prettier.yml
+++ b/.github/workflows/angular-format.yml
@@ -1,4 +1,4 @@
-name: Format
+name: Prettier & Lint
 on:
   pull_request:
     branches: [main]
@@ -17,9 +17,9 @@ jobs:
       - name: Install dependencies
         working-directory: ui
         run: npm ci
-      - name: Run prettier
+      - name: Run formatter
         working-directory: ui
-        run: npm run prettier
+        run: npm run format
       - name: add and commit any files that have changed
         id: add_and_commit
         uses: EndBug/add-and-commit@c8bfb4ff65642c4c54445500822f6e7da558994a
diff --git a/ui/package.json b/ui/package.json
index c216350f9..822637f5d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -9,10 +9,10 @@
     "watch": "ng build --base-href ./ --watch --configuration development",
     "test": "ng test",
     "lint": "ng lint",
-    "prettier": "npx prettier --write ."
+    "format": "ng lint --fix && npx prettier --write ."
   },
   "private": true,
-  "dependencies": {
+  "dependencies": { 
     "@angular/animations": "^16.2.9",
     "@angular/cdk": "^16.2.9",
     "@angular/common": "^16.2.9",
diff --git a/ui/src/app/account/account.module.ts b/ui/src/app/account/account.module.ts
index c06b2283e..c626c1d44 100644
--- a/ui/src/app/account/account.module.ts
+++ b/ui/src/app/account/account.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { LoginComponent } from './login/login.component'
-import { RouterModule, Routes } from '@angular/router'
+import { RouterModule } from '@angular/router'
 import { ReactiveFormsModule } from '@angular/forms'
 import { routes } from './account.route'
 
diff --git a/ui/src/app/account/account.route.ts b/ui/src/app/account/account.route.ts
index 17978d8b7..2ff5186c3 100644
--- a/ui/src/app/account/account.route.ts
+++ b/ui/src/app/account/account.route.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router'
 import { LoginComponent } from './login/login.component'
-import { AuthGuard } from './auth.guard'
-import { HomeComponent } from '../home/home.component'
 
 export const routes: Routes = [
   {
diff --git a/ui/src/app/account/auth.guard.ts b/ui/src/app/account/auth.guard.ts
index dbacf7568..e3c1d826a 100644
--- a/ui/src/app/account/auth.guard.ts
+++ b/ui/src/app/account/auth.guard.ts
@@ -7,7 +7,7 @@ import {
 
 import { StateStorageService } from './service/state-storage.service'
 import { AccountService } from './service/account.service'
-import { Observable, filter, map, take } from 'rxjs'
+import { Observable, filter, map } from 'rxjs'
 
 export const AuthGuard = (
   route: ActivatedRouteSnapshot,
diff --git a/ui/src/app/account/login/login.component.html b/ui/src/app/account/login/login.component.html
index ebf27f665..396d1fb41 100644
--- a/ui/src/app/account/login/login.component.html
+++ b/ui/src/app/account/login/login.component.html
@@ -87,8 +87,10 @@
         <p></p>
         <div class="alert alert-warning">
           <a
+            tabindex="1"
             class="alert-link"
             (click)="requestResetPassword()"
+            (keypress)="requestResetPassword()"
             jhiTranslate="login.password.forgot.string"
             >Did you forget your password?</a
           >
diff --git a/ui/src/app/layout/navbar/navbar.component.html b/ui/src/app/layout/navbar/navbar.component.html
index 7bba8ab9a..e7f805435 100644
--- a/ui/src/app/layout/navbar/navbar.component.html
+++ b/ui/src/app/layout/navbar/navbar.component.html
@@ -3,7 +3,7 @@
   <span jhiTranslate="global.menu.account.loggedInAs.string"></span>
   <b>{{ this.getUserName() }}</b> |
   <span jhiTranslate="global.menu.account.logoutAs.string"></span
-  ><a (click)="logoutAs()" id="logoutAs.string">
+  ><a tabindex="1" (click)="logoutAs()" (keypress)="logoutAs()" id="logoutAs.string">
     {{ this.getUserName() }}
     <fa-icon icon="sign-out-alt" [fixedWidth]="true"></fa-icon>
   </a>
@@ -344,7 +344,7 @@
             </a>
           </li>
           <li>
-            <a class="dropdown-item" (click)="logout()" id="logout">
+            <a class="dropdown-item" tabindex="1" (click)="logout()" (keypress)="logout()" id="logout">
               <fa-icon [icon]="faSignOutAlt" [fixedWidth]="true"></fa-icon>
               <span jhiTranslate="global.menu.account.logout.string"
                 >Sign out</span
diff --git a/ui/src/app/shared/model/event.model.ts b/ui/src/app/shared/model/event.model.ts
index 09f518fba..5643c6f10 100644
--- a/ui/src/app/shared/model/event.model.ts
+++ b/ui/src/app/shared/model/event.model.ts
@@ -3,6 +3,6 @@ import { EventType } from 'src/app/app.constants'
 export class Event {
   constructor(
     public type: EventType,
-    public payload: String
+    public payload: string
   ) {}
 }