diff --git a/frontend/src/hooks/api/users/queries.tsx b/frontend/src/hooks/api/users/queries.tsx
index 2c0125361..22d4f39d8 100644
--- a/frontend/src/hooks/api/users/queries.tsx
+++ b/frontend/src/hooks/api/users/queries.tsx
@@ -508,7 +508,7 @@ export const useListUserGroupMemberships = (username: string) => {
   });
 };
 
-export const useGetUserTotpRegistration = () => {
+export const useGetUserTotpRegistration = (options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: userKeys.totpRegistration,
     queryFn: async () => {
@@ -517,7 +517,8 @@ export const useGetUserTotpRegistration = () => {
       );
 
       return data;
-    }
+    },
+    enabled: options?.enabled ?? true
   });
 };
 
diff --git a/frontend/src/pages/user/PersonalSettingsPage/components/SecuritySection/MFASection.tsx b/frontend/src/pages/user/PersonalSettingsPage/components/SecuritySection/MFASection.tsx
index 25275edc2..a23d3e8f9 100644
--- a/frontend/src/pages/user/PersonalSettingsPage/components/SecuritySection/MFASection.tsx
+++ b/frontend/src/pages/user/PersonalSettingsPage/components/SecuritySection/MFASection.tsx
@@ -1,6 +1,8 @@
+import { useEffect, useState } from "react";
 import { useQueryClient } from "@tanstack/react-query";
+import QRCode from "qrcode";
 
-import TotpRegistration from "@app/components/mfa/TotpRegistration";
+import { RecoveryCodesDownload } from "@app/components/mfa/RecoveryCodesDownload";
 import { createNotification } from "@app/components/notifications";
 import {
   Button,
@@ -8,9 +10,9 @@ import {
   DeleteActionModal,
   EmailServiceSetupModal,
   FormControl,
+  Input,
   Select,
-  SelectItem,
-  Switch
+  SelectItem
 } from "@app/components/v2";
 import { useToggle } from "@app/hooks";
 import { useGetUser, userKeys, useUpdateUserMfa } from "@app/hooks/api";
@@ -18,9 +20,13 @@ import { MfaMethod } from "@app/hooks/api/auth/types";
 import { useFetchServerStatus } from "@app/hooks/api/serverDetails";
 import {
   useCreateNewTotpRecoveryCodes,
-  useDeleteUserTotpConfiguration
+  useDeleteUserTotpConfiguration,
+  useVerifyUserTotpRegistration
 } from "@app/hooks/api/users/mutation";
-import { useGetUserTotpConfiguration } from "@app/hooks/api/users/queries";
+import {
+  useGetUserTotpConfiguration,
+  useGetUserTotpRegistration
+} from "@app/hooks/api/users/queries";
 import { AuthMethod } from "@app/hooks/api/users/types";
 import { usePopUp } from "@app/hooks/usePopUp";
 
@@ -28,24 +34,65 @@ export const MFASection = () => {
   const { data: user } = useGetUser();
   const { mutateAsync } = useUpdateUserMfa();
 
+  const [formData, setFormData] = useState({
+    isMfaEnabled: user?.isMfaEnabled || false,
+    selectedMfaMethod: user?.selectedMfaMethod || MfaMethod.EMAIL
+  });
+  const [isLoading, setIsLoading] = useState(false);
+  const [totpCode, setTotpCode] = useState("");
+  const [qrCodeUrl, setQrCodeUrl] = useState("");
+  const [showMobileAuthSetup, setShowMobileAuthSetup] = useState(false);
+
   const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
     "setUpEmail",
-    "deleteTotpConfig"
+    "deleteTotpConfig",
+    "downloadRecoveryCodes"
   ] as const);
   const [shouldShowRecoveryCodes, setShouldShowRecoveryCodes] = useToggle();
-  const { data: totpConfiguration, isPending: isTotpConfigurationLoading } =
-    useGetUserTotpConfiguration();
+  const { data: totpConfiguration } = useGetUserTotpConfiguration();
+  const { data: totpRegistration, isPending: isTotpRegistrationLoading } =
+    useGetUserTotpRegistration({
+      enabled: showMobileAuthSetup
+    });
   const { mutateAsync: deleteTotpConfiguration } = useDeleteUserTotpConfiguration();
   const { mutateAsync: createTotpRecoveryCodes } = useCreateNewTotpRecoveryCodes();
+  const { mutateAsync: verifyUserTotp } = useVerifyUserTotpRegistration();
   const queryClient = useQueryClient();
   const { data: serverDetails } = useFetchServerStatus();
 
+  // Update form data when user data changes
+  useEffect(() => {
+    if (user) {
+      setFormData({
+        isMfaEnabled: user.isMfaEnabled,
+        selectedMfaMethod: user.selectedMfaMethod || MfaMethod.EMAIL
+      });
+    }
+  }, [user]);
+
+  useEffect(() => {
+    const generateQRCode = async () => {
+      if (totpRegistration?.otpUrl) {
+        const url = await QRCode.toDataURL(totpRegistration.otpUrl);
+        setQrCodeUrl(url);
+      }
+    };
+
+    if (showMobileAuthSetup && totpRegistration?.otpUrl) {
+      generateQRCode();
+    }
+  }, [totpRegistration, showMobileAuthSetup]);
+
   const handleTotpDeletion = async () => {
     try {
       await deleteTotpConfiguration();
 
+      await mutateAsync({
+        selectedMfaMethod: MfaMethod.EMAIL
+      });
+
       createNotification({
-        text: "Successfully deleted mobile authenticator",
+        text: "Successfully deleted mobile authenticator and switched to email authentication",
         type: "success"
       });
 
@@ -82,30 +129,35 @@ export const MFASection = () => {
     }
   };
 
-  const updateSelectedMfa = async (mfaMethod: MfaMethod) => {
-    try {
-      if (!user) return;
+  const handleFormDataChange = (field: string, value: any) => {
+    setFormData((prev) => ({
+      ...prev,
+      [field]: value
+    }));
 
-      await mutateAsync({
-        selectedMfaMethod: mfaMethod
-      });
-
-      createNotification({
-        text: "Successfully updated selected 2FA method",
-        type: "success"
-      });
-    } catch (err) {
-      createNotification({
-        text: "Something went wrong while updating selected 2FA method.",
-        type: "error"
-      });
-      console.error(err);
+    // Show mobile auth setup when mobile authenticator is selected and we're enabling 2FA
+    if (field === "selectedMfaMethod" && value === MfaMethod.TOTP && formData.isMfaEnabled) {
+      setShowMobileAuthSetup(true);
+    } else if (field === "selectedMfaMethod" && value !== MfaMethod.TOTP) {
+      setShowMobileAuthSetup(false);
+      setTotpCode("");
+      setShouldShowRecoveryCodes.off();
+      if (totpConfiguration?.isVerified) {
+        deleteTotpConfiguration().catch(console.error);
+      }
+    } else if (field === "isMfaEnabled" && value && formData.selectedMfaMethod === MfaMethod.TOTP) {
+      setShowMobileAuthSetup(true);
+    } else if (field === "isMfaEnabled" && !value) {
+      setShowMobileAuthSetup(false);
+      setTotpCode("");
+      setShouldShowRecoveryCodes.off();
     }
   };
 
-  const toggleMfa = async (state: boolean) => {
+  const handleSaveChanges = async () => {
     try {
       if (!user) return;
+
       if (user.authMethods.includes(AuthMethod.LDAP)) {
         createNotification({
           text: "Two-factor authentication is not available for LDAP users.",
@@ -114,119 +166,350 @@ export const MFASection = () => {
         return;
       }
 
-      const newUser = await mutateAsync({
-        isMfaEnabled: state
-      });
+      if (!serverDetails?.emailConfigured && formData.isMfaEnabled) {
+        handlePopUpOpen("setUpEmail");
+        return;
+      }
 
-      createNotification({
-        text: `${
-          newUser.isMfaEnabled
-            ? "Successfully turned on two-factor authentication."
-            : "Successfully turned off two-factor authentication."
-        }`,
-        type: "success"
-      });
+      setIsLoading(true);
+
+      // If enabling 2FA with mobile authenticator, verify TOTP first
+      if (
+        formData.isMfaEnabled &&
+        formData.selectedMfaMethod === MfaMethod.TOTP &&
+        !totpConfiguration?.isVerified
+      ) {
+        if (!totpCode.trim()) {
+          createNotification({
+            text: "Please enter the verification code from your authenticator app",
+            type: "error"
+          });
+          setIsLoading(false);
+          return;
+        }
+
+        try {
+          await verifyUserTotp({ totp: totpCode });
+
+          handlePopUpOpen("downloadRecoveryCodes");
+
+          createNotification({
+            text: "Successfully configured mobile authenticator. Please save your recovery codes!",
+            type: "success"
+          });
+
+          await queryClient.invalidateQueries({ queryKey: userKeys.totpConfiguration });
+        } catch {
+          createNotification({
+            text: "Failed to verify TOTP code. Please try again.",
+            type: "error"
+          });
+          setIsLoading(false);
+          return;
+        }
+      }
+
+      // If disabling 2FA and there's a TOTP configuration, delete it
+      if (!formData.isMfaEnabled && user.isMfaEnabled && totpConfiguration?.isVerified) {
+        try {
+          await deleteTotpConfiguration();
+          createNotification({
+            text: "Mobile authenticator removed",
+            type: "success"
+          });
+
+          // Refresh TOTP configuration
+          await queryClient.invalidateQueries({ queryKey: userKeys.totpConfiguration });
+        } catch {
+          // Continue with disabling 2FA even if TOTP deletion fails
+        }
+      }
+
+      const updates: any = {};
+
+      // Only update if values have changed
+      if (formData.isMfaEnabled !== user.isMfaEnabled) {
+        updates.isMfaEnabled = formData.isMfaEnabled;
+      }
+
+      if (formData.selectedMfaMethod !== user.selectedMfaMethod) {
+        updates.selectedMfaMethod = formData.selectedMfaMethod;
+      }
+
+      if (Object.keys(updates).length > 0) {
+        await mutateAsync(updates);
+
+        createNotification({
+          text: "Successfully updated two-factor authentication settings",
+          type: "success"
+        });
+      }
+
+      // Reset form state
+      setShowMobileAuthSetup(false);
+      setTotpCode("");
+      setShouldShowRecoveryCodes.off();
     } catch (err) {
       createNotification({
-        text: "Something went wrong while toggling the two-factor authentication.",
+        text: "Something went wrong while updating two-factor authentication settings.",
         type: "error"
       });
       console.error(err);
+    } finally {
+      setIsLoading(false);
     }
   };
 
+  const hasChanges =
+    user &&
+    (formData.isMfaEnabled !== user.isMfaEnabled ||
+      formData.selectedMfaMethod !== user.selectedMfaMethod);
+
+  const isFormValid = () => {
+    if (!formData.isMfaEnabled) return true;
+    if (formData.selectedMfaMethod === MfaMethod.EMAIL) return true;
+    if (formData.selectedMfaMethod === MfaMethod.TOTP) {
+      if (totpConfiguration?.isVerified) return true;
+      return totpCode.trim().length > 0;
+    }
+    return false;
+  };
+
   return (
     <>
-      <div className="mb-6 max-w-6xl rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-        <p className="mb-4 text-xl font-semibold text-mineshaft-100">Two-factor Authentication</p>
+      <form
+        onSubmit={(e) => {
+          e.preventDefault();
+          handleSaveChanges();
+        }}
+        className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4"
+      >
+        <h2 className="mb-6 text-xl font-semibold text-mineshaft-100">Two-factor Authentication</h2>
+
         {user && (
-          <Switch
-            className="data-[state=checked]:bg-primary"
-            id="isTwoFAEnabled"
-            isChecked={user?.isMfaEnabled}
-            onCheckedChange={(state) => {
-              if (serverDetails?.emailConfigured) {
-                toggleMfa(state as boolean);
-              } else {
-                handlePopUpOpen("setUpEmail");
-              }
-            }}
-          >
-            Enable 2-factor authentication
-          </Switch>
-        )}
-        {user?.isMfaEnabled && (
-          <FormControl label="Selected 2FA method" className="mt-3">
-            <Select
-              className="min-w-[20rem] border border-mineshaft-500"
-              onValueChange={updateSelectedMfa}
-              defaultValue={user.selectedMfaMethod ?? MfaMethod.EMAIL}
-            >
-              <SelectItem value={MfaMethod.EMAIL} key="mfa-method-email">
-                Email
-              </SelectItem>
-              <SelectItem value={MfaMethod.TOTP} key="mfa-method-totp">
-                Mobile Authenticator
-              </SelectItem>
-            </Select>
-          </FormControl>
-        )}
-        <div className="mt-8 text-lg font-semibold text-mineshaft-100">Mobile Authenticator</div>
-        {isTotpConfigurationLoading ? (
-          <ContentLoader />
-        ) : (
-          <div>
-            {totpConfiguration?.isVerified ? (
-              <div className="mt-2">
-                <div className="flex flex-row gap-2">
-                  <Button colorSchema="secondary" onClick={setShouldShowRecoveryCodes.toggle}>
-                    {shouldShowRecoveryCodes ? "Hide recovery codes" : "Show recovery codes"}
-                  </Button>
-                  <Button colorSchema="secondary" onClick={handleGenerateMoreRecoveryCodes}>
-                    Generate more codes
-                  </Button>
-                  <Button colorSchema="danger" onClick={() => handlePopUpOpen("deleteTotpConfig")}>
-                    Delete
-                  </Button>
-                </div>
-                {shouldShowRecoveryCodes && totpConfiguration.recoveryCodes && (
-                  <div className="mt-4 bg-mineshaft-600 p-4">
-                    {totpConfiguration.recoveryCodes.map((code) => (
-                      <div key={code}>{code}</div>
-                    ))}
-                  </div>
-                )}
+          <div className="space-y-4">
+            <div className="max-w-md">
+              <FormControl
+                label="Enable 2-factor authentication"
+                helperText="Adds an extra layer of security to your account"
+              >
+                <Select
+                  value={formData.isMfaEnabled ? "enabled" : "disabled"}
+                  onValueChange={(value) =>
+                    handleFormDataChange("isMfaEnabled", value === "enabled")
+                  }
+                  className="w-full"
+                >
+                  <SelectItem value="disabled">Disabled</SelectItem>
+                  <SelectItem value="enabled">Enabled</SelectItem>
+                </Select>
+              </FormControl>
+            </div>
+
+            {formData.isMfaEnabled && (
+              <div className="max-w-md">
+                <FormControl
+                  label="Authentication method"
+                  helperText="Choose your preferred method for two-factor authentication"
+                >
+                  <Select
+                    value={formData.selectedMfaMethod}
+                    onValueChange={(value) =>
+                      handleFormDataChange("selectedMfaMethod", value as MfaMethod)
+                    }
+                    className="w-full"
+                  >
+                    <SelectItem value={MfaMethod.EMAIL}>Email</SelectItem>
+                    <SelectItem value={MfaMethod.TOTP}>Mobile Authenticator</SelectItem>
+                  </Select>
+                </FormControl>
               </div>
-            ) : (
-              <>
-                <div className="text-sm text-gray-400">
-                  For added security, you can configure a mobile authenticator and set it as your
-                  selected 2FA method.
+            )}
+
+            {showMobileAuthSetup && !totpConfiguration?.isVerified && (
+              <div className="space-y-6">
+                <h3 className="mb-6 text-lg font-semibold text-mineshaft-100">
+                  Setup Mobile Authenticator
+                </h3>
+
+                <div className="mb-8">
+                  <h4 className="mb-2 text-sm font-medium text-mineshaft-200">
+                    Step 1: Scan QR Code
+                  </h4>
+                  <p className="mb-4 text-sm text-mineshaft-300">
+                    Download a two-factor authentication app (Google Authenticator, Authy, etc.) and
+                    scan the QR code below
+                  </p>
+
+                  <div>
+                    {isTotpRegistrationLoading && (
+                      <div className="py-12">
+                        <ContentLoader />
+                      </div>
+                    )}
+                    {!isTotpRegistrationLoading && qrCodeUrl && (
+                      <div>
+                        <div className="mb-4 w-72 pl-4">
+                          <div className="inline-flex items-center justify-center rounded-xl bg-white p-6 shadow-lg">
+                            <img
+                              src={qrCodeUrl}
+                              alt="QR Code for mobile authenticator setup"
+                              className="h-48 w-48"
+                            />
+                          </div>
+                        </div>
+                        {totpRegistration?.otpUrl && (
+                          <div>
+                            <p className="mb-2 text-xs text-mineshaft-400">
+                              Can&apos;t scan? Enter this code manually:{" "}
+                              <code className="rounded bg-mineshaft-700 px-3 py-1 font-mono text-sm text-mineshaft-100">
+                                {totpRegistration.otpUrl.split("secret=")[1]?.split("&")[0] ||
+                                  "Loading..."}
+                              </code>
+                            </p>
+                          </div>
+                        )}
+                      </div>
+                    )}
+                  </div>
                 </div>
-                <div className="ml-6 mt-6 flex min-w-full">
-                  <TotpRegistration
-                    onComplete={async () => {
-                      await queryClient.invalidateQueries({ queryKey: userKeys.totpConfiguration });
-                    }}
-                  />
+
+                <div>
+                  <h4 className="mb-2 text-sm font-medium text-mineshaft-200">
+                    Step 2: Enter verification code
+                  </h4>
+                  <p className="mb-4 text-sm text-mineshaft-300">
+                    Enter the 6-digit code from your authenticator app to complete setup
+                  </p>
+
+                  <div className="max-w-48">
+                    <FormControl isRequired>
+                      <Input
+                        value={totpCode}
+                        onChange={(e) => {
+                          const value = e.target.value.replace(/\D/g, "").slice(0, 6);
+                          setTotpCode(value);
+                        }}
+                        onPaste={(e) => {
+                          e.preventDefault();
+                          const pastedData = e.clipboardData
+                            .getData("text")
+                            .replace(/\D/g, "")
+                            .slice(0, 6);
+                          setTotpCode(pastedData);
+                        }}
+                        placeholder="Enter 2FA code"
+                        className="font-mono tracking-wider"
+                        maxLength={6}
+                      />
+                    </FormControl>
+                  </div>
                 </div>
-              </>
+              </div>
+            )}
+
+            {hasChanges && (
+              <div className="flex gap-2 pt-4">
+                <Button
+                  type="submit"
+                  isLoading={isLoading}
+                  disabled={!isFormValid()}
+                  colorSchema="primary"
+                  variant="outline_bg"
+                >
+                  Save Changes
+                </Button>
+                <Button
+                  type="button"
+                  variant="outline_bg"
+                  onClick={() => {
+                    if (user) {
+                      setFormData({
+                        isMfaEnabled: user.isMfaEnabled,
+                        selectedMfaMethod: user.selectedMfaMethod || MfaMethod.EMAIL
+                      });
+                    }
+                    setShowMobileAuthSetup(false);
+                    setTotpCode("");
+                    setShouldShowRecoveryCodes.off();
+                  }}
+                  disabled={isLoading}
+                  className="border-mineshaft-500 text-mineshaft-300 hover:border-mineshaft-400"
+                >
+                  Cancel
+                </Button>
+              </div>
+            )}
+
+            {user?.isMfaEnabled && totpConfiguration?.isVerified && (
+              <div className="mt-8 border-t border-mineshaft-600 pt-6">
+                <h3 className="mb-4 text-lg font-semibold text-mineshaft-100">
+                  Mobile Authenticator Management
+                </h3>
+
+                <div className="space-y-4">
+                  <div className="flex flex-wrap gap-2">
+                    <Button
+                      colorSchema="secondary"
+                      variant="outline_bg"
+                      onClick={setShouldShowRecoveryCodes.toggle}
+                    >
+                      {shouldShowRecoveryCodes ? "Hide recovery codes" : "Show recovery codes"}
+                    </Button>
+                    <Button
+                      colorSchema="secondary"
+                      variant="outline_bg"
+                      onClick={handleGenerateMoreRecoveryCodes}
+                    >
+                      Generate more codes
+                    </Button>
+                    <Button
+                      colorSchema="danger"
+                      variant="outline_bg"
+                      onClick={() => handlePopUpOpen("deleteTotpConfig")}
+                    >
+                      Remove Authenticator
+                    </Button>
+                  </div>
+
+                  {shouldShowRecoveryCodes && (
+                    <div className="mt-6 grid w-full grid-cols-4 gap-3">
+                      {totpConfiguration.recoveryCodes.map((code) => (
+                        <code
+                          key={code}
+                          className="block rounded bg-mineshaft-800 px-3 py-2 text-center font-mono text-sm text-mineshaft-100"
+                        >
+                          {code}
+                        </code>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              </div>
             )}
           </div>
         )}
-      </div>
+      </form>
+
       <EmailServiceSetupModal
         isOpen={popUp.setUpEmail?.isOpen}
         onOpenChange={(isOpen) => handlePopUpToggle("setUpEmail", isOpen)}
       />
       <DeleteActionModal
         isOpen={popUp.deleteTotpConfig.isOpen}
-        title="Are you sure you want to delete the configured authenticator?"
-        subTitle="This action is irreversible. You’ll have to go through the setup process to enable it again."
+        title="Remove mobile authenticator?"
+        subTitle="This action is irreversible. You'll have to go through the setup process to enable it again."
         onChange={(isOpen) => handlePopUpToggle("deleteTotpConfig", isOpen)}
         deleteKey="confirm"
         onDeleteApproved={handleTotpDeletion}
       />
+
+      <RecoveryCodesDownload
+        isOpen={popUp.downloadRecoveryCodes?.isOpen || false}
+        onClose={() => handlePopUpClose("downloadRecoveryCodes")}
+        recoveryCodes={totpRegistration?.recoveryCodes || []}
+        onDownloadComplete={() => handlePopUpClose("downloadRecoveryCodes")}
+      />
     </>
   );
 };