diff --git a/src/context/intermediate/popovers/ModifyAccount.tsx b/src/context/intermediate/popovers/ModifyAccount.tsx
index 78b123ee..f47a5d06 100644
--- a/src/context/intermediate/popovers/ModifyAccount.tsx
+++ b/src/context/intermediate/popovers/ModifyAccount.tsx
@@ -38,6 +38,7 @@ export function ModifyAccountModal({ onClose, field }: Props) {
         new_email,
         new_password,
     }) => {
+        if (processing) return;
         setProcessing(true);
 
         try {
@@ -74,6 +75,7 @@ export function ModifyAccountModal({ onClose, field }: Props) {
             disabled={processing}
             actions={[
                 {
+                    disabled: processing,
                     confirmation: true,
                     onClick: handleSubmit(onSubmit),
                     children:
@@ -104,6 +106,7 @@ export function ModifyAccountModal({ onClose, field }: Props) {
                         register={register}
                         showOverline
                         error={errors.new_email?.message}
+                        disabled={processing}
                     />
                 )}
                 {field === "password" && (
@@ -114,6 +117,7 @@ export function ModifyAccountModal({ onClose, field }: Props) {
                         showOverline
                         error={errors.new_password?.message}
                         autoComplete="new-password"
+                        disabled={processing}
                     />
                 )}
                 {field === "username" && (
@@ -123,6 +127,7 @@ export function ModifyAccountModal({ onClose, field }: Props) {
                         register={register}
                         showOverline
                         error={errors.new_username?.message}
+                        disabled={processing}
                     />
                 )}
                 <FormField
@@ -131,6 +136,7 @@ export function ModifyAccountModal({ onClose, field }: Props) {
                     showOverline
                     error={errors.current_password?.message}
                     autoComplete="current-password"
+                    disabled={processing}
                 />
                 {error && (
                     <Overline type="error" error={error}>
diff --git a/src/context/intermediate/popovers/UserProfile.tsx b/src/context/intermediate/popovers/UserProfile.tsx
index 2c20d3d6..af8192c2 100644
--- a/src/context/intermediate/popovers/UserProfile.tsx
+++ b/src/context/intermediate/popovers/UserProfile.tsx
@@ -185,16 +185,16 @@ export const UserProfile = observer(
                                 </Tooltip>
                             </Localizer>
                         )}
-                        {user.relationship === RelationshipStatus.User && (
-                            <IconButton
-                                onClick={() => {
-                                    onClose?.();
-                                    if (dummy) return;
-                                    history.push(`/settings/profile`);
-                                }}>
-                                <Edit size={28} />
-                            </IconButton>
-                        )}
+                        {user.relationship === RelationshipStatus.User &&
+                            !dummy && (
+                                <IconButton
+                                    onClick={() => {
+                                        onClose?.();
+                                        history.push(`/settings/profile`);
+                                    }}>
+                                    <Edit size={28} />
+                                </IconButton>
+                            )}
                         {!user.bot &&
                             flags != 2 &&
                             flags != 4 &&