Ben · Ben
--- a/src/app/modules/auth/forgot-password/forgot-password.component.ts
+++ b/src/app/modules/auth/forgot-password/forgot-password.component.ts
-        code: this.code,
-        username: this.username
-      })
-        .then((response: any) => {
-          this.session.login(response.user);
-          this.router.navigate(['/newsfeed']);
-        })
-        .catch((e) => {
-          this.error = e.message;
-          setTimeout(() => {
-            this.router.navigate(['/login']);
-          }, 2000);
-        });
+    this.error = '';
+    if (!this.validatePassword(password)) {
+      this.error = 'Password must have more than 8 characters. Including uppercase, numbers, special characters (ie. !,#,@), and cannot have spaces.';
--- a/src/app/modules/auth/forgot-password/forgot-password.component.spec.ts
+++ b/src/app/modules/auth/forgot-password/forgot-password.component.spec.ts
+    clientMock.post.calls.reset();
+    sessionMock.login.calls.reset();
+    getResetButton().nativeElement.click();
+
+    tick();
+    fixture.detectChanges();
+
+    expect(getError().nativeElement.textContent).toContain('Password must have more than 8 characters. Including uppercase, numbers, special characters (ie. !,#,@), and cannot have spaces.');
+    expect(clientMock.post).not.toHaveBeenCalled();
+    expect(sessionMock.login).not.toHaveBeenCalled();
+  }));
+
+  it('should not allow the user to enter a password with fewer than 8 characters', fakeAsync(() => {
+    comp.step = 3;
+    comp.username = 'test';
+    comp.code = 'code';