diff --git a/src/components/Login/Signup.tsx b/src/components/Login/Signup.tsx
index 46dc3d582a..3f20468023 100644
--- a/src/components/Login/Signup.tsx
+++ b/src/components/Login/Signup.tsx
@@ -135,7 +135,7 @@ export default function Signup(props: SignupProps): ReactElement {
       [SignupField.Username]: !meetsUsernameRequirements(username),
       [SignupField.Email]: !email,
       [SignupField.Password1]: !meetsPasswordRequirements(password1),
-      [SignupField.Password2]: password1 !== password2!,
+      [SignupField.Password2]: password1 !== password2,
     };
 
     if (Object.values(err).some((e) => e)) {
@@ -255,9 +255,7 @@ export default function Signup(props: SignupProps): ReactElement {
               <Grid item>
                 <Button
                   id={SignupId.ButtonLogIn}
-                  onClick={() => {
-                    router.navigate(Path.Login);
-                  }}
+                  onClick={() => router.navigate(Path.Login)}
                   type="button"
                   variant="outlined"
                 >
diff --git a/src/components/Login/tests/Signup.test.tsx b/src/components/Login/tests/Signup.test.tsx
index bf099fa529..b12429a002 100644
--- a/src/components/Login/tests/Signup.test.tsx
+++ b/src/components/Login/tests/Signup.test.tsx
@@ -35,8 +35,9 @@ jest.mock("types/hooks", () => {
 });
 
 const mockAsyncSignUp = jest.fn();
-const mockChangeEvent = (text: string): ChangeEvent =>
-  ({ target: { value: text } }) as any as ChangeEvent;
+const mockChangeEvent = (text: string): Partial<ChangeEvent> => ({
+  target: { value: text } as HTMLTextAreaElement | HTMLInputElement,
+});
 const mockFormEvent: Partial<FormEvent> = { preventDefault: jest.fn() };
 const mockStore = configureMockStore()({ loginState });