diff --git a/lib/towerops_web/live/account_live/my_data.ex b/lib/towerops_web/live/account_live/my_data.ex
index 431673cd..ef1543a4 100644
--- a/lib/towerops_web/live/account_live/my_data.ex
+++ b/lib/towerops_web/live/account_live/my_data.ex
@@ -84,7 +84,7 @@ defmodule ToweropsWeb.AccountLive.MyData do
           >
             <li>
               <.link
-                navigate={~p"/users/settings"}
+                navigate={~p"/users/settings?tab=personal"}
                 class="text-gray-500 hover:text-indigo-600 dark:text-gray-400 dark:hover:text-indigo-400"
               >
                 Personal
@@ -92,8 +92,7 @@ defmodule ToweropsWeb.AccountLive.MyData do
             </li>
             <li>
               <.link
-                navigate={~p"/users/settings"}
-                phx-click={JS.push("switch_tab", value: %{tab: "account"})}
+                navigate={~p"/users/settings?tab=account"}
                 class="text-gray-500 hover:text-indigo-600 dark:text-gray-400 dark:hover:text-indigo-400"
               >
                 Account
@@ -101,17 +100,7 @@ defmodule ToweropsWeb.AccountLive.MyData do
             </li>
             <li>
               <.link
-                navigate={~p"/users/settings"}
-                phx-click={JS.push("switch_tab", value: %{tab: "security"})}
-                class="text-gray-500 hover:text-indigo-600 dark:text-gray-400 dark:hover:text-indigo-400"
-              >
-                Security
-              </.link>
-            </li>
-            <li>
-              <.link
-                navigate={~p"/users/settings"}
-                phx-click={JS.push("switch_tab", value: %{tab: "sessions"})}
+                navigate={~p"/users/settings?tab=sessions"}
                 class="text-gray-500 hover:text-indigo-600 dark:text-gray-400 dark:hover:text-indigo-400"
               >
                 Sessions
@@ -119,8 +108,7 @@ defmodule ToweropsWeb.AccountLive.MyData do
             </li>
             <li>
               <.link
-                navigate={~p"/users/settings"}
-                phx-click={JS.push("switch_tab", value: %{tab: "api"})}
+                navigate={~p"/users/settings?tab=api"}
                 class="text-gray-500 hover:text-indigo-600 dark:text-gray-400 dark:hover:text-indigo-400"
               >
                 API
@@ -128,13 +116,20 @@ defmodule ToweropsWeb.AccountLive.MyData do
             </li>
             <li>
               <.link
-                navigate={~p"/users/settings"}
-                phx-click={JS.push("switch_tab", value: %{tab: "notifications"})}
+                navigate={~p"/users/settings?tab=notifications"}
                 class="text-gray-500 hover:text-indigo-600 dark:text-gray-400 dark:hover:text-indigo-400"
               >
                 Notifications
               </.link>
             </li>
+            <li>
+              <.link
+                navigate={~p"/users/settings?tab=security"}
+                class="text-gray-500 hover:text-indigo-600 dark:text-gray-400 dark:hover:text-indigo-400"
+              >
+                Security
+              </.link>
+            </li>
             <li>
               <.link
                 navigate={~p"/users/my-data"}