From 859aa99102c63b2dd44031312af02b4b50927a61 Mon Sep 17 00:00:00 2001
From: Aaron Detre <aarondetre@gmail.com>
Date: Tue, 14 Jul 2026 22:56:53 -0700
Subject: [PATCH 01/14] Handle basic email verification

---
 src/app/domain/user.ts                             |  1 +
 src/app/login/login-home/login-home.component.html |  5 +++++
 src/app/login/login-home/login-home.component.ts   | 13 +++++++++++++
 src/app/services/user.service.ts                   |  7 +++++++
 4 files changed, 26 insertions(+)

diff --git a/src/app/domain/user.ts b/src/app/domain/user.ts
index cb64a9233ce..29b973cd666 100644
--- a/src/app/domain/user.ts
+++ b/src/app/domain/user.ts
@@ -5,6 +5,7 @@ export class User {
   isGoogleUser: boolean = false;
   isRecaptchaInvalid: boolean = false;
   isRecaptchaRequired: boolean;
+  isVerified: boolean;
   language: string;
   lastName: string;
   microsoftUserId: string;
diff --git a/src/app/login/login-home/login-home.component.html b/src/app/login/login-home/login-home.component.html
index afc553f51f7..8a6a8d7fc1e 100644
--- a/src/app/login/login-home/login-home.component.html
+++ b/src/app/login/login-home/login-home.component.html
@@ -56,6 +56,11 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
           >
         }
       }
+      @if (isTeacherVerificationFailed) {
+        <p class="warn center standalone__error" i18n>
+          Your email has not been verified. Check your email for a verification link.
+        </p>
+      }
       <p>
         <button
           mat-flat-button
diff --git a/src/app/login/login-home/login-home.component.ts b/src/app/login/login-home/login-home.component.ts
index 6412e298f5a..05869f1c0c8 100644
--- a/src/app/login/login-home/login-home.component.ts
+++ b/src/app/login/login-home/login-home.component.ts
@@ -38,6 +38,7 @@ export class LoginHomeComponent implements OnInit {
   isRecaptchaEnabled: boolean = false;
   isRecaptchaVerificationFailed: boolean = false;
   isReLoginDueToErrorSavingData: boolean;
+  protected isTeacherVerificationFailed: boolean = false;
   protected microsoftAuthenticationEnabled: boolean;
   passwordError: boolean = false;
   processing: boolean = false;
@@ -95,6 +96,18 @@ export class LoginHomeComponent implements OnInit {
         this.recaptchaV3Service.execute('importantAction')
       );
     }
+    this.userService.isVerified(this.credentials.username).subscribe((isVerified) => {
+      if (isVerified) {
+        this.authenticateUser();
+      } else {
+        this.processing = false;
+        this.credentials.password = '';
+        this.isTeacherVerificationFailed = true;
+      }
+    });
+  }
+
+  private authenticateUser(): void {
     this.userService.authenticate(this.credentials, (response: any) => {
       if (this.userService.isAuthenticated) {
         this.router.navigateByUrl(this.getRedirectUrl(''));
diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts
index d19e24ab221..079595c792a 100644
--- a/src/app/services/user.service.ts
+++ b/src/app/services/user.service.ts
@@ -17,6 +17,7 @@ export class UserService {
   private googleUserUrl = '/api/google-user/get-user';
   private checkAuthenticationUrl = '/api/user/check-authentication';
   private changePasswordUrl = '/api/user/password';
+  private checkVerifiedUrl = '/api/user/is-verified';
   private languagesUrl = '/api/user/languages';
   private contactUrl = '/api/contact';
   private unlinkGoogleAccountUrl = '/api/google-user/unlink-account';
@@ -76,6 +77,12 @@ export class UserService {
     return this.getUser().getValue().isGoogleUser;
   }
 
+  isVerified(username: string): Observable<boolean> {
+    return this.http.get<boolean>(this.checkVerifiedUrl, {
+      params: new HttpParams().set('username', username)
+    });
+  }
+
   retrieveUserPromise(): Promise<User> {
     return this.retrieveUser().toPromise();
   }

From 66628fc4445691462e8751b7549e53b9b27b6089 Mon Sep 17 00:00:00 2001
From: Aaron Detre <aarondetre@gmail.com>
Date: Wed, 15 Jul 2026 15:40:01 -0700
Subject: [PATCH 02/14] Removed sign in button and updated text on teacher
 registration complete page

---
 .../register-teacher-complete.component.html         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/register/register-teacher-complete/register-teacher-complete.component.html b/src/app/register/register-teacher-complete/register-teacher-complete.component.html
index 4874a2e7919..26416c08cd4 100644
--- a/src/app/register/register-teacher-complete/register-teacher-complete.component.html
+++ b/src/app/register/register-teacher-complete/register-teacher-complete.component.html
@@ -7,11 +7,15 @@ <h2 class="standalone__title accent" i18n>Your WISE account has been created!</h
         >.
       </p>
     }
-    <p i18n>You should receive an email with your account details shortly.</p>
+    @if (!socialAccount) {
+      <p i18n>To sign in, you must verify your account.</p>
+      <p i18n>
+        You should receive an email shortly with instructions to complete your registration.
+      </p>
+    } @else {
+      <p i18n>You should receive an email with your account details shortly.</p>
+    }
     <p>
-      @if (!socialAccount) {
-        <a mat-flat-button color="primary" (click)="login()" i18n>Sign In to Get Started</a>
-      }
       @if (isUsingGoogleId) {
         <a
           class="button--social-login button--google"

From 93f75b10d629935e0490585d5b959b75ff2399ab Mon Sep 17 00:00:00 2001
From: Aaron Detre <aarondetre@gmail.com>
Date: Wed, 15 Jul 2026 15:40:57 -0700
Subject: [PATCH 03/14] Show a confirmation when a user's account has just been
 verified

---
 src/app/login/login-home/login-home.component.html | 3 +++
 src/app/login/login-home/login-home.component.ts   | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/app/login/login-home/login-home.component.html b/src/app/login/login-home/login-home.component.html
index 8a6a8d7fc1e..f544d2f71a9 100644
--- a/src/app/login/login-home/login-home.component.html
+++ b/src/app/login/login-home/login-home.component.html
@@ -61,6 +61,9 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
           Your email has not been verified. Check your email for a verification link.
         </p>
       }
+      @if (showVerifiedConfirmation) {
+        <p class="success center standalone__error" i18n>Your email has been verified.</p>
+      }
       <p>
         <button
           mat-flat-button
diff --git a/src/app/login/login-home/login-home.component.ts b/src/app/login/login-home/login-home.component.ts
index 05869f1c0c8..b2543e2700d 100644
--- a/src/app/login/login-home/login-home.component.ts
+++ b/src/app/login/login-home/login-home.component.ts
@@ -44,6 +44,7 @@ export class LoginHomeComponent implements OnInit {
   processing: boolean = false;
   @ViewChild('recaptchaRef', { static: false }) recaptchaRef: any;
   protected showSocialLogin: boolean;
+  protected showVerifiedConfirmation: boolean = false;
 
   constructor(
     private configService: ConfigService,
@@ -78,6 +79,9 @@ export class LoginHomeComponent implements OnInit {
       if (params['accessCode'] != null) {
         this.accessCode = params['accessCode'];
       }
+      if (params['verified'] != null) {
+        this.showVerifiedConfirmation = params['verified'] === 'true';
+      }
     });
     this.isReLoginDueToErrorSavingData = this.isRedirectToAppRoutes();
     this.isRecaptchaEnabled = this.configService.isRecaptchaEnabled();
@@ -91,6 +95,7 @@ export class LoginHomeComponent implements OnInit {
   async login(): Promise<void> {
     this.processing = true;
     this.passwordError = false;
+    this.showVerifiedConfirmation = false;
     if (this.isRecaptchaEnabled) {
       this.credentials.recaptchaResponse = await lastValueFrom(
         this.recaptchaV3Service.execute('importantAction')

From bc048abe5cb9f985cc55367233ea2ff73629ee68 Mon Sep 17 00:00:00 2001
From: Aaron Detre <aarondetre@gmail.com>
Date: Thu, 16 Jul 2026 15:50:03 -0700
Subject: [PATCH 04/14] Allow teachers to resend the verification email

---
 .../login-home/login-home.component.html      | 18 ++++++-
 .../login/login-home/login-home.component.ts  | 49 ++++++++++++++++---
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/src/app/login/login-home/login-home.component.html b/src/app/login/login-home/login-home.component.html
index f544d2f71a9..f457fe2c161 100644
--- a/src/app/login/login-home/login-home.component.html
+++ b/src/app/login/login-home/login-home.component.html
@@ -56,12 +56,20 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
           >
         }
       }
-      @if (isTeacherVerificationFailed) {
+      @if (showTeacherVerificationFailed()) {
         <p class="warn center standalone__error" i18n>
           Your email has not been verified. Check your email for a verification link.
+          @if (allowResendEmail()) {
+            <a href="#" (click)="resendEmail($event)">Click here</a> resend the verification email.
+          } @else {
+            Please wait to send another verification email ({{ resendEmailWaitSeconds() }}).
+          }
         </p>
       }
-      @if (showVerifiedConfirmation) {
+      @if (showEmailSentConfirmation()) {
+        <p class="success center standalone__error" i18n>A verification email has been sent.</p>
+      }
+      @if (showVerifiedConfirmation()) {
         <p class="success center standalone__error" i18n>Your email has been verified.</p>
       }
       <p>
@@ -114,6 +122,12 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
   <mat-divider />
   <mat-card-content class="center">
     <p><a routerLink="/forgot" i18n>Forgot username or password?</a></p>
+    <!-- <p>
+      <a href="#" (click)="toggleShowVerificationResend($event)" i18n
+        >Didn't receive a verification email?</a
+      > -->
+    <!-- </p> -->
+    <!-- @if (showVerificationResend()) {} -->
     <p i18n>New to WISE? <a routerLink="/join">Join for free!</a></p>
   </mat-card-content>
 </mat-card>
diff --git a/src/app/login/login-home/login-home.component.ts b/src/app/login/login-home/login-home.component.ts
index b2543e2700d..89fedde8d55 100644
--- a/src/app/login/login-home/login-home.component.ts
+++ b/src/app/login/login-home/login-home.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, signal, ViewChild } from '@angular/core';
 import { Router, ActivatedRoute, RouterLink } from '@angular/router';
 import { UserService } from '../../services/user.service';
 import { ConfigService } from '../../services/config.service';
@@ -11,6 +11,7 @@ import { MatInput } from '@angular/material/input';
 import { MatButton } from '@angular/material/button';
 import { MatProgressBar } from '@angular/material/progress-bar';
 import { MatDivider } from '@angular/material/divider';
+import { HttpClient, HttpParams } from '@angular/common/http';
 
 @Component({
   imports: [
@@ -38,16 +39,22 @@ export class LoginHomeComponent implements OnInit {
   isRecaptchaEnabled: boolean = false;
   isRecaptchaVerificationFailed: boolean = false;
   isReLoginDueToErrorSavingData: boolean;
-  protected isTeacherVerificationFailed: boolean = false;
   protected microsoftAuthenticationEnabled: boolean;
   passwordError: boolean = false;
   processing: boolean = false;
   @ViewChild('recaptchaRef', { static: false }) recaptchaRef: any;
+  private resendEmailEndpoint = '/api/teacher/verify-email';
+  private resendEmailInterval: any;
+  protected resendEmailWaitSeconds = signal<number>(0);
+  protected showEmailSentConfirmation = signal<boolean>(false);
+  protected showTeacherVerificationFailed = signal<boolean>(false);
   protected showSocialLogin: boolean;
-  protected showVerifiedConfirmation: boolean = false;
+  protected showVerificationResend = signal<boolean>(false);
+  protected showVerifiedConfirmation = signal<boolean>(false);
 
   constructor(
     private configService: ConfigService,
+    private http: HttpClient,
     private router: Router,
     private route: ActivatedRoute,
     private recaptchaV3Service: ReCaptchaV3Service,
@@ -80,11 +87,19 @@ export class LoginHomeComponent implements OnInit {
         this.accessCode = params['accessCode'];
       }
       if (params['verified'] != null) {
-        this.showVerifiedConfirmation = params['verified'] === 'true';
+        this.showVerifiedConfirmation.set(params['verified'] === 'true');
       }
     });
     this.isReLoginDueToErrorSavingData = this.isRedirectToAppRoutes();
     this.isRecaptchaEnabled = this.configService.isRecaptchaEnabled();
+
+    this.resendEmailInterval = setInterval(() => {
+      this.resendEmailWaitSeconds.update((current) => current - 1);
+    }, 1000);
+  }
+
+  ngOnDestroy(): void {
+    clearInterval(this.resendEmailInterval);
   }
 
   private isRedirectToAppRoutes(): boolean {
@@ -95,7 +110,8 @@ export class LoginHomeComponent implements OnInit {
   async login(): Promise<void> {
     this.processing = true;
     this.passwordError = false;
-    this.showVerifiedConfirmation = false;
+    this.showVerifiedConfirmation.set(false);
+    this.showEmailSentConfirmation.set(false);
     if (this.isRecaptchaEnabled) {
       this.credentials.recaptchaResponse = await lastValueFrom(
         this.recaptchaV3Service.execute('importantAction')
@@ -107,7 +123,7 @@ export class LoginHomeComponent implements OnInit {
       } else {
         this.processing = false;
         this.credentials.password = '';
-        this.isTeacherVerificationFailed = true;
+        this.showTeacherVerificationFailed.set(true);
       }
     });
   }
@@ -154,4 +170,25 @@ export class LoginHomeComponent implements OnInit {
   private appendAccessCodeParameter(url: string): string {
     return `${url}${url.includes('?') ? '&' : '?'}accessCode=${this.accessCode}`;
   }
+
+  protected toggleShowVerificationResend(e: Event): void {
+    e.preventDefault();
+    this.showVerificationResend.update((current) => !current);
+  }
+
+  protected allowResendEmail(): boolean {
+    return this.resendEmailWaitSeconds() <= 0;
+  }
+
+  protected resendEmail(e: Event): void {
+    e.preventDefault();
+    const params = new HttpParams().set('username', this.credentials.username);
+    this.http
+      .post<String>(`${this.resendEmailEndpoint}`, null, { params })
+      .subscribe((response) => {
+        this.showTeacherVerificationFailed.set(false);
+        this.resendEmailWaitSeconds.set(10);
+        this.showEmailSentConfirmation.set(true);
+      });
+  }
 }

From 7c686625ed0b40d132995be0fbd2e4e141840c58 Mon Sep 17 00:00:00 2001
From: Aaron Detre <aarondetre@gmail.com>
Date: Fri, 17 Jul 2026 12:35:53 -0700
Subject: [PATCH 05/14] Update endpoints

---
 src/app/login/login-home/login-home.component.ts | 2 +-
 src/app/services/user.service.ts                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/login/login-home/login-home.component.ts b/src/app/login/login-home/login-home.component.ts
index 89fedde8d55..d94fc8518ce 100644
--- a/src/app/login/login-home/login-home.component.ts
+++ b/src/app/login/login-home/login-home.component.ts
@@ -43,7 +43,7 @@ export class LoginHomeComponent implements OnInit {
   passwordError: boolean = false;
   processing: boolean = false;
   @ViewChild('recaptchaRef', { static: false }) recaptchaRef: any;
-  private resendEmailEndpoint = '/api/teacher/verify-email';
+  private resendEmailEndpoint = '/api/teacher/register/send-verify-email';
   private resendEmailInterval: any;
   protected resendEmailWaitSeconds = signal<number>(0);
   protected showEmailSentConfirmation = signal<boolean>(false);
diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts
index 079595c792a..cb3abfa70b9 100644
--- a/src/app/services/user.service.ts
+++ b/src/app/services/user.service.ts
@@ -17,7 +17,7 @@ export class UserService {
   private googleUserUrl = '/api/google-user/get-user';
   private checkAuthenticationUrl = '/api/user/check-authentication';
   private changePasswordUrl = '/api/user/password';
-  private checkVerifiedUrl = '/api/user/is-verified';
+  private checkVerifiedUrl = '/api/teacher/is-verified';
   private languagesUrl = '/api/user/languages';
   private contactUrl = '/api/contact';
   private unlinkGoogleAccountUrl = '/api/google-user/unlink-account';

From 5c3bd8b9ee6edc09b1b9f58eb472e54fb96750fd Mon Sep 17 00:00:00 2001
From: Aaron Detre <aarondetre@gmail.com>
Date: Fri, 17 Jul 2026 12:56:04 -0700
Subject: [PATCH 06/14] Show email sent confirmation if email was successful,
 otherwise show error message

---
 .../login/login-home/login-home.component.html  |  4 ++++
 .../login/login-home/login-home.component.ts    | 17 +++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/app/login/login-home/login-home.component.html b/src/app/login/login-home/login-home.component.html
index f457fe2c161..68969e7c2f1 100644
--- a/src/app/login/login-home/login-home.component.html
+++ b/src/app/login/login-home/login-home.component.html
@@ -68,6 +68,10 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
       }
       @if (showEmailSentConfirmation()) {
         <p class="success center standalone__error" i18n>A verification email has been sent.</p>
+      } @else if (showEmailSentError()) {
+        <p class="warn center standalone__error" i18n>
+          There was an error sending the verification email. Please try again later.
+        </p>
       }
       @if (showVerifiedConfirmation()) {
         <p class="success center standalone__error" i18n>Your email has been verified.</p>
diff --git a/src/app/login/login-home/login-home.component.ts b/src/app/login/login-home/login-home.component.ts
index d94fc8518ce..15213cdd6af 100644
--- a/src/app/login/login-home/login-home.component.ts
+++ b/src/app/login/login-home/login-home.component.ts
@@ -47,6 +47,7 @@ export class LoginHomeComponent implements OnInit {
   private resendEmailInterval: any;
   protected resendEmailWaitSeconds = signal<number>(0);
   protected showEmailSentConfirmation = signal<boolean>(false);
+  protected showEmailSentError = signal<boolean>(false);
   protected showTeacherVerificationFailed = signal<boolean>(false);
   protected showSocialLogin: boolean;
   protected showVerificationResend = signal<boolean>(false);
@@ -112,6 +113,7 @@ export class LoginHomeComponent implements OnInit {
     this.passwordError = false;
     this.showVerifiedConfirmation.set(false);
     this.showEmailSentConfirmation.set(false);
+    this.showEmailSentError.set(false);
     if (this.isRecaptchaEnabled) {
       this.credentials.recaptchaResponse = await lastValueFrom(
         this.recaptchaV3Service.execute('importantAction')
@@ -182,13 +184,16 @@ export class LoginHomeComponent implements OnInit {
 
   protected resendEmail(e: Event): void {
     e.preventDefault();
+    this.resendEmailWaitSeconds.set(60);
+    this.showTeacherVerificationFailed.set(false);
     const params = new HttpParams().set('username', this.credentials.username);
-    this.http
-      .post<String>(`${this.resendEmailEndpoint}`, null, { params })
-      .subscribe((response) => {
-        this.showTeacherVerificationFailed.set(false);
-        this.resendEmailWaitSeconds.set(10);
+    this.http.post<String>(`${this.resendEmailEndpoint}`, null, { params }).subscribe({
+      next: () => {
         this.showEmailSentConfirmation.set(true);
-      });
+      },
+      error: () => {
+        this.showEmailSentError.set(true);
+      }
+    });
   }
 }

From 0933bacf86f05b35adeb3df9455895a2b1bd9d16 Mon Sep 17 00:00:00 2001
From: Aaron Detre <aarondetre@gmail.com>
Date: Mon, 20 Jul 2026 17:17:59 -0700
Subject: [PATCH 07/14] Combine signals into one state signal

---
 .../login-home/login-home.component.html      | 16 +++--------
 .../login/login-home/login-home.component.ts  | 27 +++++++------------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/app/login/login-home/login-home.component.html b/src/app/login/login-home/login-home.component.html
index 68969e7c2f1..903c5ed6cb1 100644
--- a/src/app/login/login-home/login-home.component.html
+++ b/src/app/login/login-home/login-home.component.html
@@ -56,7 +56,7 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
           >
         }
       }
-      @if (showTeacherVerificationFailed()) {
+      @if (verificationState() === 'unverified') {
         <p class="warn center standalone__error" i18n>
           Your email has not been verified. Check your email for a verification link.
           @if (allowResendEmail()) {
@@ -65,15 +65,13 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
             Please wait to send another verification email ({{ resendEmailWaitSeconds() }}).
           }
         </p>
-      }
-      @if (showEmailSentConfirmation()) {
+      } @else if (verificationState() === 'emailSent') {
         <p class="success center standalone__error" i18n>A verification email has been sent.</p>
-      } @else if (showEmailSentError()) {
+      } @else if (verificationState() === 'emailError') {
         <p class="warn center standalone__error" i18n>
           There was an error sending the verification email. Please try again later.
         </p>
-      }
-      @if (showVerifiedConfirmation()) {
+      } @else if (verificationState() === 'confirmVerified') {
         <p class="success center standalone__error" i18n>Your email has been verified.</p>
       }
       <p>
@@ -126,12 +124,6 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
   <mat-divider />
   <mat-card-content class="center">
     <p><a routerLink="/forgot" i18n>Forgot username or password?</a></p>
-    <!-- <p>
-      <a href="#" (click)="toggleShowVerificationResend($event)" i18n
-        >Didn't receive a verification email?</a
-      > -->
-    <!-- </p> -->
-    <!-- @if (showVerificationResend()) {} -->
     <p i18n>New to WISE? <a routerLink="/join">Join for free!</a></p>
   </mat-card-content>
 </mat-card>
diff --git a/src/app/login/login-home/login-home.component.ts b/src/app/login/login-home/login-home.component.ts
index 15213cdd6af..e177c73ba4b 100644
--- a/src/app/login/login-home/login-home.component.ts
+++ b/src/app/login/login-home/login-home.component.ts
@@ -46,12 +46,10 @@ export class LoginHomeComponent implements OnInit {
   private resendEmailEndpoint = '/api/teacher/register/send-verify-email';
   private resendEmailInterval: any;
   protected resendEmailWaitSeconds = signal<number>(0);
-  protected showEmailSentConfirmation = signal<boolean>(false);
-  protected showEmailSentError = signal<boolean>(false);
-  protected showTeacherVerificationFailed = signal<boolean>(false);
   protected showSocialLogin: boolean;
-  protected showVerificationResend = signal<boolean>(false);
-  protected showVerifiedConfirmation = signal<boolean>(false);
+  protected verificationState = signal<
+    'none' | 'confirmVerified' | 'emailSent' | 'emailError' | 'unverified'
+  >('none');
 
   constructor(
     private configService: ConfigService,
@@ -88,7 +86,7 @@ export class LoginHomeComponent implements OnInit {
         this.accessCode = params['accessCode'];
       }
       if (params['verified'] != null) {
-        this.showVerifiedConfirmation.set(params['verified'] === 'true');
+        this.verificationState.set('confirmVerified');
       }
     });
     this.isReLoginDueToErrorSavingData = this.isRedirectToAppRoutes();
@@ -111,9 +109,7 @@ export class LoginHomeComponent implements OnInit {
   async login(): Promise<void> {
     this.processing = true;
     this.passwordError = false;
-    this.showVerifiedConfirmation.set(false);
-    this.showEmailSentConfirmation.set(false);
-    this.showEmailSentError.set(false);
+    this.verificationState.set('none');
     if (this.isRecaptchaEnabled) {
       this.credentials.recaptchaResponse = await lastValueFrom(
         this.recaptchaV3Service.execute('importantAction')
@@ -125,7 +121,7 @@ export class LoginHomeComponent implements OnInit {
       } else {
         this.processing = false;
         this.credentials.password = '';
-        this.showTeacherVerificationFailed.set(true);
+        this.verificationState.set('unverified');
       }
     });
   }
@@ -173,11 +169,6 @@ export class LoginHomeComponent implements OnInit {
     return `${url}${url.includes('?') ? '&' : '?'}accessCode=${this.accessCode}`;
   }
 
-  protected toggleShowVerificationResend(e: Event): void {
-    e.preventDefault();
-    this.showVerificationResend.update((current) => !current);
-  }
-
   protected allowResendEmail(): boolean {
     return this.resendEmailWaitSeconds() <= 0;
   }
@@ -185,14 +176,14 @@ export class LoginHomeComponent implements OnInit {
   protected resendEmail(e: Event): void {
     e.preventDefault();
     this.resendEmailWaitSeconds.set(60);
-    this.showTeacherVerificationFailed.set(false);
+    this.verificationState.set('none');
     const params = new HttpParams().set('username', this.credentials.username);
     this.http.post<String>(`${this.resendEmailEndpoint}`, null, { params }).subscribe({
       next: () => {
-        this.showEmailSentConfirmation.set(true);
+        this.verificationState.set('emailSent');
       },
       error: () => {
-        this.showEmailSentError.set(true);
+        this.verificationState.set('emailError');
       }
     });
   }

From 53c59d95cd04443d977a0d598ad3c163b0f53bcc Mon Sep 17 00:00:00 2001
From: Aaron Detre <aarondetre@gmail.com>
Date: Mon, 20 Jul 2026 17:23:10 -0700
Subject: [PATCH 08/14] Write/Fix tests

---
 .../login-home/login-home.component.spec.ts   | 63 +++++++++++++++----
 1 file changed, 51 insertions(+), 12 deletions(-)

diff --git a/src/app/login/login-home/login-home.component.spec.ts b/src/app/login/login-home/login-home.component.spec.ts
index 5e1870b21e1..0807b468171 100644
--- a/src/app/login/login-home/login-home.component.spec.ts
+++ b/src/app/login/login-home/login-home.component.spec.ts
@@ -8,6 +8,7 @@ import { By } from '@angular/platform-browser';
 import { HttpClient, provideHttpClient } from '@angular/common/http';
 import { provideRouter, Router } from '@angular/router';
 import { getErrorMessage } from '../../common/test-helper';
+import { DebugElement } from '@angular/core';
 
 let component: LoginHomeComponent;
 let configService: ConfigService;
@@ -76,35 +77,36 @@ function loginWithRecaptchaDisabled() {
       component.isRecaptchaEnabled = false;
     });
     incorrectPassword();
-    correctPassword();
+    correctPasswordVerifiedAccount();
+    unverifiedAccount();
+    unverifiedAccountWaitToResendEmail();
   });
 }
 
 function incorrectPassword() {
   describe('user enters incorrect password', () => {
-    it('should show error message', fakeAsync(() => {
+    it('should show authentication error message', fakeAsync(() => {
       spyOn(http, 'post').and.returnValue(of({}));
       spyOn(http, 'get').and.returnValue(of(null));
+      spyOn(userService, 'isVerified').and.returnValue(of(true));
       component.login();
       tickAndDetectChanges();
-      const errorMessageElement = fixture.debugElement
-        .queryAll(By.css('p'))
-        .find(
-          (element) =>
-            element.nativeElement.textContent.trim() ===
-            'Username and password not recognized. Please try again.'
-        );
-      expect(errorMessageElement.nativeElement.classList.contains('warn')).toBeTruthy();
+      const errorMessageElement = getErrorMessageElement(
+        'Username and password not recognized. Please try again.'
+      );
+      expect(errorMessageElement).toBeDefined();
+      expect(errorMessageElement!.nativeElement.classList.contains('warn')).toBeTruthy();
       expect(component.credentials.password).toEqual('');
     }));
   });
 }
 
-function correctPassword() {
-  describe('user enters correct password', () => {
+function correctPasswordVerifiedAccount() {
+  describe('user enters correct password and account is verified', () => {
     it('should navigate to home page', fakeAsync(() => {
       spyOn(http, 'post').and.returnValue(of({}));
       spyOn(http, 'get').and.returnValue(of({ id: 1 }));
+      spyOn(userService, 'isVerified').and.returnValue(of(true));
       const routerNavigateSpy = spyOn(router, 'navigateByUrl');
       component.login();
       tickAndDetectChanges();
@@ -113,6 +115,37 @@ function correctPassword() {
   });
 }
 
+function unverifiedAccount() {
+  describe('login attempt with unverified account', () => {
+    it('should show verification error message', fakeAsync(() => {
+      spyOn(userService, 'isVerified').and.returnValue(of(false));
+      component.login();
+      tickAndDetectChanges();
+      const errorMessageElement = getErrorMessageElement(
+        'Your email has not been verified. Check your email for a verification link. Click here resend the verification email.'
+      );
+      expect(errorMessageElement).toBeDefined();
+      expect(errorMessageElement!.nativeElement.classList.contains('warn')).toBeTruthy();
+    }));
+  });
+}
+
+function unverifiedAccountWaitToResendEmail() {
+  describe('login attempt with unverified account and must wait to resend the email', () => {
+    it('should show verification error message with countdown to resend', fakeAsync(() => {
+      spyOn(userService, 'isVerified').and.returnValue(of(false));
+      component['resendEmailWaitSeconds'].set(60);
+      component.login();
+      tickAndDetectChanges();
+      const errorMessageElement = getErrorMessageElement(
+        'Your email has not been verified. Check your email for a verification link.  Please wait to send another verification email (60).'
+      );
+      expect(errorMessageElement).toBeDefined();
+      expect(errorMessageElement!.nativeElement.classList.contains('warn')).toBeTruthy();
+    }));
+  });
+}
+
 function loginWithRecaptchaEnabled() {
   xdescribe('recaptcha is enabled', () => {
     beforeEach(() => {
@@ -138,3 +171,9 @@ function tickAndDetectChanges() {
   tick();
   fixture.detectChanges();
 }
+
+function getErrorMessageElement(errorMsg: string): DebugElement | undefined {
+  return fixture.debugElement
+    .queryAll(By.css('p'))
+    .find((element) => element.nativeElement.textContent.trim() === errorMsg);
+}

From 03fc2a75d8a8e3e8ce34bad1f2cbed5a7141d3b3 Mon Sep 17 00:00:00 2001
From: Aaron Detre <aarondetre@gmail.com>
Date: Mon, 20 Jul 2026 21:47:32 -0700
Subject: [PATCH 09/14] Show error if verification code does not match any user
 in database

---
 .../login/login-home/login-home.component.html | 18 +++++++++++-------
 .../login/login-home/login-home.component.ts   | 10 +++++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/app/login/login-home/login-home.component.html b/src/app/login/login-home/login-home.component.html
index 903c5ed6cb1..19293e2f818 100644
--- a/src/app/login/login-home/login-home.component.html
+++ b/src/app/login/login-home/login-home.component.html
@@ -56,7 +56,15 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
           >
         }
       }
-      @if (verificationState() === 'unverified') {
+      @if (verificationState() === 'confirmVerified') {
+        <p class="success center standalone__error" i18n>Your email has been verified.</p>
+      } @else if (verificationState() === 'emailError') {
+        <p class="warn center standalone__error" i18n>
+          There was an error sending the verification email. Please try again later.
+        </p>
+      } @else if (verificationState() === 'emailSent') {
+        <p class="success center standalone__error" i18n>A verification email has been sent.</p>
+      } @else if (verificationState() === 'unverified') {
         <p class="warn center standalone__error" i18n>
           Your email has not been verified. Check your email for a verification link.
           @if (allowResendEmail()) {
@@ -65,14 +73,10 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
             Please wait to send another verification email ({{ resendEmailWaitSeconds() }}).
           }
         </p>
-      } @else if (verificationState() === 'emailSent') {
-        <p class="success center standalone__error" i18n>A verification email has been sent.</p>
-      } @else if (verificationState() === 'emailError') {
+      } @else if (verificationState() === 'verificationError') {
         <p class="warn center standalone__error" i18n>
-          There was an error sending the verification email. Please try again later.
+          Your account could not be verified. Make sure you click the link sent to your email.
         </p>
-      } @else if (verificationState() === 'confirmVerified') {
-        <p class="success center standalone__error" i18n>Your email has been verified.</p>
       }
       <p>
         <button
diff --git a/src/app/login/login-home/login-home.component.ts b/src/app/login/login-home/login-home.component.ts
index e177c73ba4b..46a3051fa5a 100644
--- a/src/app/login/login-home/login-home.component.ts
+++ b/src/app/login/login-home/login-home.component.ts
@@ -48,7 +48,7 @@ export class LoginHomeComponent implements OnInit {
   protected resendEmailWaitSeconds = signal<number>(0);
   protected showSocialLogin: boolean;
   protected verificationState = signal<
-    'none' | 'confirmVerified' | 'emailSent' | 'emailError' | 'unverified'
+    'none' | 'confirmVerified' | 'emailError' | 'emailSent' | 'unverified' | 'verificationError'
   >('none');
 
   constructor(
@@ -85,8 +85,12 @@ export class LoginHomeComponent implements OnInit {
       if (params['accessCode'] != null) {
         this.accessCode = params['accessCode'];
       }
-      if (params['verified'] != null) {
-        this.verificationState.set('confirmVerified');
+      if (params['verified']) {
+        if (params['verified'] === 'true') {
+          this.verificationState.set('confirmVerified');
+        } else if (params['verified'] === 'error') {
+          this.verificationState.set('verificationError');
+        }
       }
     });
     this.isReLoginDueToErrorSavingData = this.isRedirectToAppRoutes();

From 71a91f5268338df4a23f7de8818a9b4c75a2be86 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Jul 2026 18:49:32 +0000
Subject: [PATCH 10/14] Updated messages

---
 src/messages.xlf | 68 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 53 insertions(+), 15 deletions(-)

diff --git a/src/messages.xlf b/src/messages.xlf
index 2abb06b8688..16141a41cdd 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -3271,7 +3271,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">70,74</context>
+          <context context-type="linenumber">88,92</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/mobile-menu/mobile-menu.component.html</context>
@@ -5670,7 +5670,7 @@
         <source>Recaptcha failed. Please reload the page and try again!</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">55,61</context>
+          <context context-type="linenumber">55,59</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-student-form/register-student-form.component.html</context>
@@ -5681,11 +5681,39 @@
           <context context-type="linenumber">160,164</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="4012536709262577430" datatype="html">
+        <source> Your email has not been verified. Check your email for a verification link. <x id="START_BLOCK_IF" equiv-text="@if (allowResendEmail()) {"/><x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;#&quot; (click)=&quot;resendEmail($event)&quot;&gt;"/>Click here<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> resend the verification email. <x id="CLOSE_BLOCK_IF" equiv-text="}"/><x id="START_BLOCK_ELSE" equiv-text="@else {"/> Please wait to send another verification email (<x id="INTERPOLATION" equiv-text="{{ resendEmailWaitSeconds() }}"/>). <x id="CLOSE_BLOCK_ELSE" equiv-text="}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
+          <context context-type="linenumber">61,68</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6685243488045620718" datatype="html">
+        <source>A verification email has been sent.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
+          <context context-type="linenumber">69,71</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1273172002423470754" datatype="html">
+        <source> There was an error sending the verification email. Please try again later. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
+          <context context-type="linenumber">72,74</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8642321302499693317" datatype="html">
+        <source>Your email has been verified.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
+          <context context-type="linenumber">75,80</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="2734138791192936323" datatype="html">
         <source>Sign in with Google</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">86,90</context>
+          <context context-type="linenumber">104,108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html</context>
@@ -5697,14 +5725,14 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-teacher-complete/register-teacher-complete.component.html</context>
-          <context context-type="linenumber">24,28</context>
+          <context context-type="linenumber">28,32</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5250220125646261119" datatype="html">
         <source>Sign in with Microsoft</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">99,103</context>
+          <context context-type="linenumber">117,121</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html</context>
@@ -5716,21 +5744,21 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-teacher-complete/register-teacher-complete.component.html</context>
-          <context context-type="linenumber">36,41</context>
+          <context context-type="linenumber">40,45</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7938452962184054866" datatype="html">
         <source>Forgot username or password?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">108,109</context>
+          <context context-type="linenumber">126,127</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7675883883328259740" datatype="html">
         <source>New to WISE? <x id="START_LINK" ctype="x-a" equiv-text="&lt;a routerLink=&quot;/join&quot;&gt;"/>Join for free!<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">109,110</context>
+          <context context-type="linenumber">127,128</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1802126598399060917" datatype="html">
@@ -6935,7 +6963,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-teacher-complete/register-teacher-complete.component.html</context>
-          <context context-type="linenumber">22,24</context>
+          <context context-type="linenumber">26,28</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/student/account/edit-profile/edit-profile.component.html</context>
@@ -7844,7 +7872,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-teacher-complete/register-teacher-complete.component.html</context>
-          <context context-type="linenumber">35,37</context>
+          <context context-type="linenumber">39,41</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8731009922587590922" datatype="html">
@@ -7871,10 +7899,6 @@
           <context context-type="sourcefile">src/app/register/register-student-complete/register-student-complete.component.html</context>
           <context context-type="linenumber">15,19</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/register/register-teacher-complete/register-teacher-complete.component.html</context>
-          <context context-type="linenumber">13,17</context>
-        </context-group>
       </trans-unit>
       <trans-unit id="1677040231113996893" datatype="html">
         <source>Create Student Account</source>
@@ -8012,11 +8036,25 @@
           <context context-type="linenumber">31,36</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="7974264077687049567" datatype="html">
+        <source>To sign in, you must verify your account.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/register/register-teacher-complete/register-teacher-complete.component.html</context>
+          <context context-type="linenumber">11,13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3848622509618106855" datatype="html">
+        <source> You should receive an email shortly with instructions to complete your registration. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/register/register-teacher-complete/register-teacher-complete.component.html</context>
+          <context context-type="linenumber">13,16</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1512267976725006491" datatype="html">
         <source>You should receive an email with your account details shortly.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-teacher-complete/register-teacher-complete.component.html</context>
-          <context context-type="linenumber">10,13</context>
+          <context context-type="linenumber">16,21</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2939852319586167137" datatype="html">

From 8270965bec2d0c311f421901446a0cf7d23ae288 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Jul 2026 20:02:21 +0000
Subject: [PATCH 11/14] Updated messages

---
 src/messages.xlf | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/messages.xlf b/src/messages.xlf
index eab92f37308..bb587076051 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -3271,7 +3271,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">88,92</context>
+          <context context-type="linenumber">92,96</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/mobile-menu/mobile-menu.component.html</context>
@@ -5681,39 +5681,46 @@
           <context context-type="linenumber">160,164</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4012536709262577430" datatype="html">
-        <source> Your email has not been verified. Check your email for a verification link. <x id="START_BLOCK_IF" equiv-text="@if (allowResendEmail()) {"/><x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;#&quot; (click)=&quot;resendEmail($event)&quot;&gt;"/>Click here<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> resend the verification email. <x id="CLOSE_BLOCK_IF" equiv-text="}"/><x id="START_BLOCK_ELSE" equiv-text="@else {"/> Please wait to send another verification email (<x id="INTERPOLATION" equiv-text="{{ resendEmailWaitSeconds() }}"/>). <x id="CLOSE_BLOCK_ELSE" equiv-text="}"/></source>
+      <trans-unit id="8642321302499693317" datatype="html">
+        <source>Your email has been verified.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
+          <context context-type="linenumber">60,62</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1273172002423470754" datatype="html">
+        <source> There was an error sending the verification email. Please try again later. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">61,68</context>
+          <context context-type="linenumber">63,65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6685243488045620718" datatype="html">
         <source>A verification email has been sent.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">69,71</context>
+          <context context-type="linenumber">66,68</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1273172002423470754" datatype="html">
-        <source> There was an error sending the verification email. Please try again later. </source>
+      <trans-unit id="4012536709262577430" datatype="html">
+        <source> Your email has not been verified. Check your email for a verification link. <x id="START_BLOCK_IF" equiv-text="@if (allowResendEmail()) {"/><x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;#&quot; (click)=&quot;resendEmail($event)&quot;&gt;"/>Click here<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> resend the verification email. <x id="CLOSE_BLOCK_IF" equiv-text="}"/><x id="START_BLOCK_ELSE" equiv-text="@else {"/> Please wait to send another verification email (<x id="INTERPOLATION" equiv-text="{{ resendEmailWaitSeconds() }}"/>). <x id="CLOSE_BLOCK_ELSE" equiv-text="}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">72,74</context>
+          <context context-type="linenumber">69,76</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8642321302499693317" datatype="html">
-        <source>Your email has been verified.</source>
+      <trans-unit id="5427380787876693719" datatype="html">
+        <source> Your account could not be verified. Make sure you click the link sent to your email. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">75,80</context>
+          <context context-type="linenumber">78,83</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2734138791192936323" datatype="html">
         <source>Sign in with Google</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">104,108</context>
+          <context context-type="linenumber">108,112</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html</context>
@@ -5732,7 +5739,7 @@
         <source>Sign in with Microsoft</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">117,121</context>
+          <context context-type="linenumber">121,125</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html</context>
@@ -5751,14 +5758,14 @@
         <source>Forgot username or password?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">126,127</context>
+          <context context-type="linenumber">130,131</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7675883883328259740" datatype="html">
         <source>New to WISE? <x id="START_LINK" ctype="x-a" equiv-text="&lt;a routerLink=&quot;/join&quot;&gt;"/>Join for free!<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">127,128</context>
+          <context context-type="linenumber">131,132</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1802126598399060917" datatype="html">

From 7cb7b978dfba738025fe74ad7014d760c52cdbe8 Mon Sep 17 00:00:00 2001
From: Jonathan Lim-Breitbart <breity10@gmail.com>
Date: Mon, 3 Aug 2026 09:31:49 -0700
Subject: [PATCH 12/14] Split verification messages into separate i18n
 messages, cleaned up template

---
 .../login-home/login-home.component.html      | 77 ++++++++++---------
 .../login-home/login-home.component.spec.ts   | 14 +++-
 2 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/src/app/login/login-home/login-home.component.html b/src/app/login/login-home/login-home.component.html
index 19293e2f818..e73cfa514eb 100644
--- a/src/app/login/login-home/login-home.component.html
+++ b/src/app/login/login-home/login-home.component.html
@@ -13,32 +13,28 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
           work. We apologize for the inconvenience.
         </p>
       }
-      <p>
-        <mat-form-field appearance="fill" class="w-full">
-          <mat-label i18n>Username</mat-label>
-          <input
-            matInput
-            id="username"
-            name="username"
-            [(ngModel)]="credentials.username"
-            [disabled]="processing"
-            autofocus
-          />
-        </mat-form-field>
-      </p>
-      <p>
-        <mat-form-field appearance="fill" class="w-full">
-          <mat-label i18n>Password</mat-label>
-          <input
-            matInput
-            id="password"
-            name="password"
-            type="password"
-            [disabled]="processing"
-            [(ngModel)]="credentials.password"
-          />
-        </mat-form-field>
-      </p>
+      <mat-form-field appearance="fill" class="w-full">
+        <mat-label i18n>Username</mat-label>
+        <input
+          matInput
+          id="username"
+          name="username"
+          [(ngModel)]="credentials.username"
+          [disabled]="processing"
+          autofocus
+        />
+      </mat-form-field>
+      <mat-form-field appearance="fill" class="w-full">
+        <mat-label i18n>Password</mat-label>
+        <input
+          matInput
+          id="password"
+          name="password"
+          type="password"
+          [disabled]="processing"
+          [(ngModel)]="credentials.password"
+        />
+      </mat-form-field>
       @if (isRecaptchaEnabled) {
         <p class="center" i18n>
           This site is protected by reCAPTCHA and the Google
@@ -57,24 +53,31 @@ <h2 class="standalone__title accent" i18n>Sign in to WISE</h2>
         }
       }
       @if (verificationState() === 'confirmVerified') {
-        <p class="success center standalone__error" i18n>Your email has been verified.</p>
+        <p class="success center" i18n>Your email has been verified.</p>
       } @else if (verificationState() === 'emailError') {
-        <p class="warn center standalone__error" i18n>
+        <p class="warn center" i18n>
           There was an error sending the verification email. Please try again later.
         </p>
       } @else if (verificationState() === 'emailSent') {
-        <p class="success center standalone__error" i18n>A verification email has been sent.</p>
+        <p class="success center" i18n>A verification email has been sent.</p>
       } @else if (verificationState() === 'unverified') {
-        <p class="warn center standalone__error" i18n>
-          Your email has not been verified. Check your email for a verification link.
-          @if (allowResendEmail()) {
-            <a href="#" (click)="resendEmail($event)">Click here</a> resend the verification email.
-          } @else {
-            Please wait to send another verification email ({{ resendEmailWaitSeconds() }}).
-          }
+        <p class="warn center">
+          <span i18n
+            >Your email has not been verified. Check your email for a verification link.</span
+          >
         </p>
+        @if (allowResendEmail()) {
+          <p class="warn center" i18n>
+            <a href="#" (click)="resendEmail($event)">Click here</a> to resend the verification
+            email.
+          </p>
+        } @else {
+          <p class="warn center" i18n>
+            Please wait to send another verification email ({{ resendEmailWaitSeconds() }}).
+          </p>
+        }
       } @else if (verificationState() === 'verificationError') {
-        <p class="warn center standalone__error" i18n>
+        <p class="warn center" i18n>
           Your account could not be verified. Make sure you click the link sent to your email.
         </p>
       }
diff --git a/src/app/login/login-home/login-home.component.spec.ts b/src/app/login/login-home/login-home.component.spec.ts
index 0807b468171..87385484ee1 100644
--- a/src/app/login/login-home/login-home.component.spec.ts
+++ b/src/app/login/login-home/login-home.component.spec.ts
@@ -21,7 +21,7 @@ const redirectUrl: string = `${contextPath}/api/j_acegi_security_check`;
 let router: Router;
 let userService: UserService;
 
-describe('LoginHomeComponent!', () => {
+fdescribe('LoginHomeComponent!', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [LoginHomeComponent],
@@ -122,10 +122,13 @@ function unverifiedAccount() {
       component.login();
       tickAndDetectChanges();
       const errorMessageElement = getErrorMessageElement(
-        'Your email has not been verified. Check your email for a verification link. Click here resend the verification email.'
+        'Your email has not been verified. Check your email for a verification link.'
       );
+      const resendLinkElement = getErrorMessageElement('Click here resend the verification email.');
       expect(errorMessageElement).toBeDefined();
       expect(errorMessageElement!.nativeElement.classList.contains('warn')).toBeTruthy();
+      expect(resendLinkElement).toBeDefined();
+      expect(resendLinkElement!.nativeElement.classList.contains('warn')).toBeTruthy();
     }));
   });
 }
@@ -138,10 +141,15 @@ function unverifiedAccountWaitToResendEmail() {
       component.login();
       tickAndDetectChanges();
       const errorMessageElement = getErrorMessageElement(
-        'Your email has not been verified. Check your email for a verification link.  Please wait to send another verification email (60).'
+        'Your email has not been verified. Check your email for a verification link.'
+      );
+      const resendLinkElement = getErrorMessageElement(
+        'Please wait to send another verification email (60).'
       );
       expect(errorMessageElement).toBeDefined();
       expect(errorMessageElement!.nativeElement.classList.contains('warn')).toBeTruthy();
+      expect(resendLinkElement).toBeDefined();
+      expect(resendLinkElement!.nativeElement.classList.contains('warn')).toBeTruthy();
     }));
   });
 }

From fa1b20ad369454e25bde60f424521c230e2a78c4 Mon Sep 17 00:00:00 2001
From: Jonathan Lim-Breitbart <breity10@gmail.com>
Date: Mon, 3 Aug 2026 09:40:29 -0700
Subject: [PATCH 13/14] Fix test

---
 src/app/login/login-home/login-home.component.spec.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/login/login-home/login-home.component.spec.ts b/src/app/login/login-home/login-home.component.spec.ts
index 87385484ee1..4b718dfff4b 100644
--- a/src/app/login/login-home/login-home.component.spec.ts
+++ b/src/app/login/login-home/login-home.component.spec.ts
@@ -21,7 +21,7 @@ const redirectUrl: string = `${contextPath}/api/j_acegi_security_check`;
 let router: Router;
 let userService: UserService;
 
-fdescribe('LoginHomeComponent!', () => {
+describe('LoginHomeComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [LoginHomeComponent],
@@ -124,7 +124,9 @@ function unverifiedAccount() {
       const errorMessageElement = getErrorMessageElement(
         'Your email has not been verified. Check your email for a verification link.'
       );
-      const resendLinkElement = getErrorMessageElement('Click here resend the verification email.');
+      const resendLinkElement = getErrorMessageElement(
+        'Click here to resend the verification email.'
+      );
       expect(errorMessageElement).toBeDefined();
       expect(errorMessageElement!.nativeElement.classList.contains('warn')).toBeTruthy();
       expect(resendLinkElement).toBeDefined();

From ba859e6e3fb0e18bd3ce6b0e9873a8e618333f4d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 3 Aug 2026 16:44:58 +0000
Subject: [PATCH 14/14] Updated messages

---
 src/messages.xlf | 48 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/messages.xlf b/src/messages.xlf
index bb587076051..7f586ec6ab4 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -2455,7 +2455,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">44,48</context>
+          <context context-type="linenumber">40,44</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-student-form/register-student-form.component.html</context>
@@ -3271,7 +3271,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">92,96</context>
+          <context context-type="linenumber">95,99</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/mobile-menu/mobile-menu.component.html</context>
@@ -3402,7 +3402,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">18,21</context>
+          <context context-type="linenumber">17,21</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/student/account/edit-profile/edit-profile.component.html</context>
@@ -3801,7 +3801,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">31,34</context>
+          <context context-type="linenumber">28,32</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-user-form/register-user-form.component.ts</context>
@@ -5663,14 +5663,14 @@
         <source> There was an error saving data. Please log in again. You may need to re-do your recent work. We apologize for the inconvenience. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">12,17</context>
+          <context context-type="linenumber">12,16</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6127361666418688159" datatype="html">
         <source>Recaptcha failed. Please reload the page and try again!</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">55,59</context>
+          <context context-type="linenumber">51,55</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-student-form/register-student-form.component.html</context>
@@ -5685,42 +5685,56 @@
         <source>Your email has been verified.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">60,62</context>
+          <context context-type="linenumber">56,58</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1273172002423470754" datatype="html">
         <source> There was an error sending the verification email. Please try again later. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">63,65</context>
+          <context context-type="linenumber">59,61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6685243488045620718" datatype="html">
         <source>A verification email has been sent.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">66,68</context>
+          <context context-type="linenumber">62,64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8017739968395194124" datatype="html">
+        <source>Your email has not been verified. Check your email for a verification link.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
+          <context context-type="linenumber">66,70</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8072181940907125418" datatype="html">
+        <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;#&quot; (click)=&quot;resendEmail($event)&quot;&gt;"/>Click here<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> to resend the verification email. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
+          <context context-type="linenumber">71,73</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4012536709262577430" datatype="html">
-        <source> Your email has not been verified. Check your email for a verification link. <x id="START_BLOCK_IF" equiv-text="@if (allowResendEmail()) {"/><x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;#&quot; (click)=&quot;resendEmail($event)&quot;&gt;"/>Click here<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> resend the verification email. <x id="CLOSE_BLOCK_IF" equiv-text="}"/><x id="START_BLOCK_ELSE" equiv-text="@else {"/> Please wait to send another verification email (<x id="INTERPOLATION" equiv-text="{{ resendEmailWaitSeconds() }}"/>). <x id="CLOSE_BLOCK_ELSE" equiv-text="}"/></source>
+      <trans-unit id="5446620310334267274" datatype="html">
+        <source> Please wait to send another verification email (<x id="INTERPOLATION" equiv-text="{{ resendEmailWaitSeconds() }}"/>). </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">69,76</context>
+          <context context-type="linenumber">76,78</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5427380787876693719" datatype="html">
         <source> Your account could not be verified. Make sure you click the link sent to your email. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">78,83</context>
+          <context context-type="linenumber">81,86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2734138791192936323" datatype="html">
         <source>Sign in with Google</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">108,112</context>
+          <context context-type="linenumber">111,115</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html</context>
@@ -5739,7 +5753,7 @@
         <source>Sign in with Microsoft</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">121,125</context>
+          <context context-type="linenumber">124,128</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html</context>
@@ -5758,14 +5772,14 @@
         <source>Forgot username or password?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">130,131</context>
+          <context context-type="linenumber">133,134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7675883883328259740" datatype="html">
         <source>New to WISE? <x id="START_LINK" ctype="x-a" equiv-text="&lt;a routerLink=&quot;/join&quot;&gt;"/>Join for free!<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login-home/login-home.component.html</context>
-          <context context-type="linenumber">131,132</context>
+          <context context-type="linenumber">134,135</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1802126598399060917" datatype="html">