diff --git a/frontend/src/components/auth/ResetPassword.tsx b/frontend/src/components/auth/ResetPassword.tsx
index d87bc74c..200be64e 100644
--- a/frontend/src/components/auth/ResetPassword.tsx
+++ b/frontend/src/components/auth/ResetPassword.tsx
@@ -7,6 +7,7 @@ import {
   FormErrorMessage,
   FormLabel,
   Input,
+  Spinner,
   Text,
   VStack,
   useToast,
@@ -217,7 +218,7 @@ const ResetPassword = (): React.ReactElement => {
             pt={1}
             pb={1}
             backgroundColor="primary.blue"
-            disabled={!!getUserError}
+            disabled={!!getUserError || resetPasswordLoading}
           >
             <Text
               variant={{
@@ -226,7 +227,7 @@ const ResetPassword = (): React.ReactElement => {
               }}
               color="white"
             >
-              {resetPasswordLoading ? "Loading..." : "Reset"}
+              {resetPasswordLoading ? <Spinner /> : "Reset"}
             </Text>
           </Button>
         </VStack>
diff --git a/frontend/src/components/auth/SetPassword.tsx b/frontend/src/components/auth/SetPassword.tsx
index 4bb9f884..4c7cbf5d 100644
--- a/frontend/src/components/auth/SetPassword.tsx
+++ b/frontend/src/components/auth/SetPassword.tsx
@@ -7,6 +7,7 @@ import {
   FormErrorMessage,
   FormLabel,
   Input,
+  Spinner,
   Text,
   VStack,
   useToast,
@@ -279,7 +280,7 @@ const SetPassword = (): React.ReactElement => {
             pt={1}
             pb={1}
             backgroundColor="primary.blue"
-            disabled={!!onboardingError || dataStatus()}
+            disabled={!!onboardingError || dataStatus() || registerLoading}
           >
             <Text
               variant={{
@@ -288,7 +289,7 @@ const SetPassword = (): React.ReactElement => {
               }}
               color="white"
             >
-              {registerLoading ? "Loading..." : "Confirm"}
+              {registerLoading ? <Spinner /> : "Confirm"}
             </Text>
           </Button>
         </VStack>