diff --git a/libs/auth/src/angular/login/desktop-login.service.ts b/libs/auth/src/angular/login/desktop-login.service.ts
index 776c9c3d6fc..2857a4288a4 100644
--- a/libs/auth/src/angular/login/desktop-login.service.ts
+++ b/libs/auth/src/angular/login/desktop-login.service.ts
@@ -25,7 +25,7 @@ export class DesktopLoginService {
    */
   setupWindowFocusHandler(focusInputCallback: () => void): void {
     const subscriptionId = "LoginComponent";
-    // TODO-rr-bw: refactor to not use deprecated broadcaster service.
+    // TODO: refactor to not use deprecated broadcaster service.
     this.broadcasterService.subscribe(subscriptionId, (message: any) => {
       this.ngZone.run(() => {
         if (message.command === "windowIsFocused") {
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index ae01b44df27..52ffb6c44fd 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -116,7 +116,7 @@ export class LoginComponent implements OnInit, OnDestroy {
   showResetPasswordAutoEnrollWarning = false;
 
   // Desktop properties
-  deferFocus: boolean = null; // TODO-rr-bw: why initialize to null instead of false
+  deferFocus: boolean | null = null;
 
   constructor(
     private activatedRoute: ActivatedRoute,