diff --git a/src/components/profile/UserSettings.astro b/src/components/profile/UserSettings.astro
index 7f0b904..49598a1 100644
--- a/src/components/profile/UserSettings.astro
+++ b/src/components/profile/UserSettings.astro
@@ -454,7 +454,16 @@ const majorsList: string[] = allMajors
                 document.body.appendChild(toast);
                 setTimeout(() => toast.remove(), 3000);
 
+                // Only update form data without affecting visibility
                 loadUserData();
+
+                // Ensure settings view stays visible
+                const defaultView = document.getElementById("defaultView");
+                const settingsView = document.getElementById("settingsView");
+                if (defaultView && settingsView) {
+                    defaultView.classList.add("hidden");
+                    settingsView.classList.remove("hidden");
+                }
             } catch (err) {
                 console.error("Failed to save settings:", err);
 
diff --git a/src/pages/profile.astro b/src/pages/profile.astro
index ed4827a..f035f75 100644
--- a/src/pages/profile.astro
+++ b/src/pages/profile.astro
@@ -204,10 +204,10 @@ const text = yaml.load(textConfig) as any;
                     <div id="defaultView">
                         <DefaultProfileView />
                     </div>
-                    <!-- <div id="settingsView" class="hidden">
+                    <div id="settingsView" class="hidden">
                         <UserSettings />
                     </div>
-                    <div id="officerView" class="hidden">
+                    <!--<div id="officerView" class="hidden">
                         <OfficerProfileView />
                     </div> -->
                 </div>
@@ -345,19 +345,20 @@ const text = yaml.load(textConfig) as any;
 
             // Update content visibility
             const tabId = (tab as HTMLElement).dataset.defaultTab;
+            const views = {
+                events: defaultView,
+                settings: settingsView,
+            };
 
-            if (defaultView && settingsView) {
-                defaultView.classList.add("hidden");
-                settingsView.classList.add("hidden");
+            // Hide all views first
+            Object.values(views).forEach((view) => {
+                if (view) view.classList.add("hidden");
+            });
 
-                switch (tabId) {
-                    case "events":
-                        defaultView.classList.remove("hidden");
-                        break;
-                    case "settings":
-                        settingsView.classList.remove("hidden");
-                        break;
-                }
+            // Show the selected view
+            const selectedView = views[tabId as keyof typeof views];
+            if (selectedView) {
+                selectedView.classList.remove("hidden");
             }
         });
     });