diff --git a/ui/src/app/account/password/password-reset-finish.component.html b/ui/src/app/account/password/password-reset-finish.component.html
index f91fb9a8a..86e29d069 100644
--- a/ui/src/app/account/password/password-reset-finish.component.html
+++ b/ui/src/app/account/password/password-reset-finish.component.html
@@ -49,7 +49,14 @@ <h1 i18n="@@reset.finish.title.string">Reset password</h1>
         <span i18n="@@reset.finish.messages.success.string"
           ><strong>Your password has been reset.</strong> Please
         </span>
-        <a class="alert-link" (click)="login()" i18n="@@global.messages.info.authenticated.link.string">sign in</a>.
+        <a
+          class="alert-link"
+          tabindex="0"
+          (click)="login()"
+          (keydown.enter)="login()"
+          i18n="@@global.messages.info.authenticated.link.string"
+          >sign in</a
+        >.
       </p>
 
       <div class="alert alert-danger" *ngIf="doNotMatch" i18n="@@global.messages.error.dontmatch.string">
diff --git a/ui/src/app/account/password/password-reset-finish.component.spec.ts b/ui/src/app/account/password/password-reset-finish.component.spec.ts
index 7b8bbd274..c6bdfb4d6 100644
--- a/ui/src/app/account/password/password-reset-finish.component.spec.ts
+++ b/ui/src/app/account/password/password-reset-finish.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { PasswordResetFinishComponent } from './password-reset-finish.component';
+import { AppModule } from 'src/app/app.module';
 
 describe('PasswordResetFinishComponent', () => {
   let component: PasswordResetFinishComponent;
@@ -8,6 +9,7 @@ describe('PasswordResetFinishComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
+      imports: [AppModule],
       declarations: [PasswordResetFinishComponent]
     });
     fixture = TestBed.createComponent(PasswordResetFinishComponent);
diff --git a/ui/src/app/account/password/password-reset-finish.component.ts b/ui/src/app/account/password/password-reset-finish.component.ts
index e5f4f473f..4133841e5 100644
--- a/ui/src/app/account/password/password-reset-finish.component.ts
+++ b/ui/src/app/account/password/password-reset-finish.component.ts
@@ -11,13 +11,13 @@ import { ActivatedRoute, Router } from '@angular/router'
 export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
   doNotMatch: string | undefined
   error: string | undefined
-  keyMissing: boolean = false
   success: string | undefined
   key: string | undefined
-  invalidKey: boolean = false
-  expiredKey: boolean = false
-  activationEmailResent: boolean = false
-  showPasswordForm: boolean = false
+  invalidKey = false
+  keyMissing = false
+  expiredKey = false
+  activationEmailResent = false
+  showPasswordForm = false
 
   passwordForm = this.fb.group({
     newPassword: ['', [Validators.required, Validators.minLength(4), Validators.maxLength(50)]],