diff --git a/web/packages/accounts/components/SetPasswordForm.tsx b/web/packages/accounts/components/SetPasswordForm.tsx
index 8c05d7ce52..1ddfa5ff1f 100644
--- a/web/packages/accounts/components/SetPasswordForm.tsx
+++ b/web/packages/accounts/components/SetPasswordForm.tsx
@@ -1,6 +1,6 @@
 import { isWeakPassword } from "@/accounts/utils";
+import { LoadingButton } from "@/base/components/mui/LoadingButton";
 import ShowHidePassword from "@ente/shared/components/Form/ShowHidePassword";
-import SubmitButton from "@ente/shared/components/SubmitButton";
 import { Box, Input, TextField, Typography } from "@mui/material";
 import { Formik } from "formik";
 import { t } from "i18next";
@@ -137,12 +137,15 @@ function SetPasswordForm(props: SetPasswordFormProps) {
                     </Typography>
 
                     <Box my={4}>
-                        <SubmitButton
-                            sx={{ my: 0 }}
+                        <LoadingButton
+                            fullWidth
+                            color="accent"
+                            type="submit"
                             loading={loading}
-                            buttonText={props.buttonText}
                             disabled={isWeakPassword(values.passphrase)}
-                        />
+                        >
+                            {props.buttonText}
+                        </LoadingButton>
                         {loading && (
                             <Typography
                                 textAlign="center"
diff --git a/web/packages/accounts/components/SignUp.tsx b/web/packages/accounts/components/SignUp.tsx
index 303f0347af..6d11442c7e 100644
--- a/web/packages/accounts/components/SignUp.tsx
+++ b/web/packages/accounts/components/SignUp.tsx
@@ -290,7 +290,7 @@ export const SignUp: React.FC<SignUpProps> = ({ router, login, host }) => {
                         </VerticallyCentered>
                         <Box mb={4}>
                             <LoadingButton
-                                size="large"
+                                fullWidth
                                 color="accent"
                                 type="submit"
                                 loading={loading}