diff --git a/src/app/auth/login/page.tsx b/src/app/auth/login/page.tsx
index 0fab09d39..290f6a9da 100644
--- a/src/app/auth/login/page.tsx
+++ b/src/app/auth/login/page.tsx
@@ -70,8 +70,8 @@ export default function Login() {
 
     /**
      * Sends a request directly to the x509 endpoint of rucio auth server to retrieve a RucioAuthTOken using x509 client certificate provided via the browser
-     * @param vo 
-     * @param account 
+     * @param vo
+     * @param account
      * @returns {@link AuthViewModel} indicating the status of the request
      */
     const handleX509Submit = async (vo: VO, loginViewModel: LoginViewModel, account?: string | undefined): Promise<AuthViewModel> => {
@@ -232,9 +232,6 @@ export default function Login() {
             .then((res) => res.json())
             .then((loginViewModel: LoginViewModel) => {
                 setViewModel(loginViewModel)
-                if (loginViewModel.isLoggedIn) {
-                    router.push(redirectURL)
-                }
             }
             )
     }, []);
diff --git a/src/component-library/Demos/01_0_Login_MultiVO.stories.ts b/src/component-library/Demos/01_0_Login_MultiVO.stories.ts
index 862ceef45..3fe43dd90 100644
--- a/src/component-library/Demos/01_0_Login_MultiVO.stories.ts
+++ b/src/component-library/Demos/01_0_Login_MultiVO.stories.ts
@@ -66,6 +66,8 @@ export const ABasicLogin: Story = {
             multiVOEnabled: false,
             voList: [voAtlas, voCMS],
             isLoggedIn: false,
+            accountsAvailable: undefined,
+            accountActive: undefined,
             rucioAuthHost: 'https://rucio.cern.ch',
         },
         authViewModel: {
@@ -92,6 +94,8 @@ export const ABasicMultiVOLogin: Story = {
             multiVOEnabled: true,
             voList: [voAtlas, voCMS, voLHCb],
             isLoggedIn: false,
+            accountsAvailable: undefined,
+            accountActive: undefined,
             rucioAuthHost: 'https://rucio.cern.ch',
         },
         authViewModel: {
diff --git a/src/component-library/Demos/01_1_Login.stories.tsx b/src/component-library/Demos/01_1_Login.stories.tsx
index c02305024..87922967b 100644
--- a/src/component-library/Demos/01_1_Login.stories.tsx
+++ b/src/component-library/Demos/01_1_Login.stories.tsx
@@ -58,6 +58,8 @@ export const Playbook_InitLogin: Story = {
             multiVOEnabled: true,
             voList: [voAtlas, voCMS],
             isLoggedIn: false,
+            accountsAvailable: undefined,
+            accountActive: undefined,
             rucioAuthHost: 'https://rucio.cern.ch',
         },
         authViewModel: {
diff --git a/src/component-library/Demos/01_1_Login_OIDC.stories.ts b/src/component-library/Demos/01_1_Login_OIDC.stories.ts
index 0fc46dc5b..7fbd493e7 100644
--- a/src/component-library/Demos/01_1_Login_OIDC.stories.ts
+++ b/src/component-library/Demos/01_1_Login_OIDC.stories.ts
@@ -66,6 +66,8 @@ export const AMultiVOOIDCEnabledLogin: Story = {
             multiVOEnabled: true,
             voList: [voAtlas, voCMS, voLHCb],
             isLoggedIn: false,
+            accountActive: undefined,
+            accountsAvailable: undefined,
             rucioAuthHost: 'https://rucio.cern.ch',
         },
         authViewModel: {
diff --git a/src/component-library/Demos/01_2_Login_multi_account.stories.tsx b/src/component-library/Demos/01_2_Login_multi_account.stories.tsx
index be48483f0..a48025f4d 100644
--- a/src/component-library/Demos/01_2_Login_multi_account.stories.tsx
+++ b/src/component-library/Demos/01_2_Login_multi_account.stories.tsx
@@ -57,14 +57,16 @@ export const Playbook_Multi_Account: Story = {
             oidcProviders: [cernOIDCProvider],
             multiVOEnabled: true,
             voList: [voAtlas, voCMS],
+            accountsAvailable: undefined,
+            accountActive: undefined,
             isLoggedIn: false,
             rucioAuthHost: 'https://rucio.cern.ch',
         },
         authViewModel: {
-            status: "success",
-            message: "",
+            status: "multiple_accounts",
+            message: "mayank,ddmadmin,tester",
             rucioAccount: "",
-            rucioMultiAccount: "mayank,ddmadmin",
+            rucioMultiAccount: "",
             rucioAuthType: "",
             rucioAuthToken: "",
             rucioIdentity: "",
diff --git a/src/component-library/Pages/Layout/AccountDropdown.tsx b/src/component-library/Pages/Layout/AccountDropdown.tsx
index 5f05e8625..d56570bab 100644
--- a/src/component-library/Pages/Layout/AccountDropdown.tsx
+++ b/src/component-library/Pages/Layout/AccountDropdown.tsx
@@ -1,7 +1,77 @@
-import { twMerge } from "tailwind-merge"
-import { ForwardedRef, forwardRef, useState } from "react"
-import { HiCog, HiSwitchHorizontal, HiLogout } from "react-icons/hi"
+import {twMerge} from "tailwind-merge"
+import {ForwardedRef, forwardRef, useState} from "react"
+import {HiSwitchHorizontal, HiLogout, HiUserAdd} from "react-icons/hi"
 import Link from "next/link"
+import {useRouter} from "next/navigation";
+
+const AccountList = (props: { accountList: string[] }) => {
+    return <div className="flex flex-col">
+        {
+            props.accountList.map((account, index) => {
+                return (
+                    <a
+                        className={twMerge(
+                            "text-text-600 hover:bg-neutral-200 hover:cursor-pointer",
+                            "dark:text-text-300 dark:hover:bg-neutral-600",
+                            "flex items-center justify-between py-2 px-1 space-x-4",
+                            "text-right"
+                        )}
+                        key={index}
+                        href={`/api/auth/switch?account=${account}&&callbackUrl=/dashboard`}
+                    >
+                        <HiSwitchHorizontal className="text-2xl text-text-900 dark:text-text-100 shrink-0"/>
+                        <span>
+                            <span>Switch to </span>
+                            <b className="text-text-800 dark:text-text-100">{account}</b>
+                        </span>
+                    </a>
+                )
+            })
+        }
+    </div>
+};
+
+const SignOutOfAllButton = () => {
+    const router = useRouter();
+
+    const signOut = async () => {
+        const request = new Request('/api/auth/logout', {
+            method: 'POST'
+        })
+        //TODO: handle errors
+        await fetch(request)
+        router.push('/auth/login')
+    };
+
+    return <div
+        className={twMerge(
+            "text-text-800 hover:bg-base-warning-200 hover:cursor-pointer",
+            "dark:text-text-100 dark:hover:bg-base-warning-600",
+            "flex items-center justify-between py-2 px-1 space-x-4",
+            "text-right",
+        )}
+        onClick={() => signOut()}
+    >
+        <span>Sign <b>out</b> of all accounts</span>
+        <HiLogout className="dark:text-text-100 text-2xl text-text-900 shrink-0"/>
+    </div>
+}
+
+const SignIntoButton = () => {
+    return <Link
+        className={twMerge(
+            "text-text-800 hover:bg-base-success-200 hover:cursor-pointer",
+            "dark:text-text-100 dark:hover:bg-base-success-600",
+            "flex items-center justify-between py-2 px-1 space-x-4",
+            "text-right",
+        )}
+        href="/auth/login"
+        prefetch={false}
+    >
+        <span>Sign <b>in to</b> another account</span>
+        <HiUserAdd className="dark:text-text-100 text-2xl text-text-900 shrink-0"/>
+    </Link>
+}
 
 export const AccountDropdown = forwardRef(function AccountDropdown
     (
@@ -12,79 +82,54 @@ export const AccountDropdown = forwardRef(function AccountDropdown
         },
         ref: ForwardedRef<HTMLDivElement>
     ) {
-    return (
+        const hasAccountChoice = props.accountsPossible.length !== 1;
+        return (
 
-        <div
-            className={twMerge("flex flex-col p-2 sm:w-fit",
-                "rounded-md border shadow-md",
-                props.isProfileOpen ? "visible" : "invisible",
-                "absolute top-10 right-0",
-                "divide-y",
-                "bg-neutral-100 dark:bg-neutral-800",
-                "z-[100]"
-            )}
-            onMouseEnter={e => e.preventDefault()}
-            ref={ref}
-        >
-            <Link
-                className={twMerge(
-                    "text-text-600 hover:bg-neutral-200 hover:cursor-pointer",
-                    "dark:text-text-300 dark:hover:bg-neutral-600",
-                    "flex items-center justify-between py-2 px-1 space-x-4",
-                    "text-right"
+            <div
+                className={twMerge("flex flex-col p-2 sm:w-fit",
+                    "rounded-md border shadow-md",
+                    props.isProfileOpen ? "visible" : "invisible",
+                    "absolute top-10 right-0",
+                    "divide-y",
+                    "bg-neutral-100 dark:bg-neutral-800",
+                    "z-[100]",
+                    "w-64 sm:w-96"
                 )}
-                href="/accountsettings"
-                prefetch={false}
+                onMouseEnter={e => e.preventDefault()}
+                ref={ref}
             >
-                <HiCog className="text-3xl text-text-600 dark:text-text-100 shrink-0" />
-                <span>
-                    <span>Settings for </span>
-                    <b className="text-text-800 dark:text-text-100">{props.accountActive}</b>
+                <div
+                    className={twMerge(
+                        "text-text-600 hover:cursor-pointer",
+                        "dark:text-text-300",
+                        "flex justify-between items-center py-4 px-1 space-x-4",
+                        "text-right"
+                    )}
+                >
+                <span className="text-xl">
+                    <span>Hello, </span>
+                    <b className="text-text-800 dark:text-text-100">{props.accountActive}</b>!
                 </span>
-            </Link>
-            <div
-                className="flex flex-col"
-            >
-                {
-                    (props.accountsPossible.filter(
-                        (account) => account !== props.accountActive
-                    )).map((account, index) => {
-                        return (
-                            <Link
-                                className={twMerge(
-                                    "text-text-600 hover:bg-neutral-200 hover:cursor-pointer",
-                                    "dark:text-text-300 dark:hover:bg-neutral-600",
-                                    "flex items-center justify-between py-2 px-1 space-x-4",
-                                    "text-right"
-                                )}
-                                key={index}
-                                href="/api/account/switch"
-                                prefetch={false}
-                            >
-                                <HiSwitchHorizontal className="text-2xl text-text-900 dark:text-text-100 shrink-0" />
-                                <span>
-                                    <span>Switch to </span>
-                                    <b className="text-text-800 dark:text-text-100">{account}</b>
-                                </span>
-                            </Link>
-                        )
-                    })
+                    <div
+                        className={twMerge(
+                            "bg-neutral-200 hover:bg-base-warning-600",
+                            "p-1",
+                            "rounded-md"
+                        )}
+                    >
+                        {/* Using the <a> tag here prevents a bug with response caching */}
+                        {/* eslint-disable-next-line @next/next/no-html-link-for-pages */}
+                        <a href="/api/auth/logout?callbackUrl=/dashboard">
+                            <HiLogout className="text-2xl text-text-900 shrink-0"/>
+                        </a>
+                    </div>
+                </div>
+                {hasAccountChoice &&
+                    <AccountList accountList={props.accountsPossible.filter(account => account !== props.accountActive)}/>
                 }
+                <SignIntoButton/>
+                {hasAccountChoice && <SignOutOfAllButton/>}
             </div>
-            <Link
-                className={twMerge(
-                    "text-text-800 hover:bg-base-warning-200 hover:cursor-pointer",
-                    "dark:text-text-100 dark:hover:bg-base-warning-600",
-                    "flex items-center justify-between py-2 px-1 space-x-4",
-                    "text-right",
-                    "w-64 sm:w-96"
-                )}
-                href="/api/auth/logout"
-                prefetch={false}
-            >
-                <b>Logout</b> <HiLogout className="text-3xl text-text-900 shrink-0" />
-            </Link>
-        </div>
-    )
-}
+        )
+    }
 )
\ No newline at end of file
diff --git a/src/component-library/Pages/Login/Login.stories.tsx b/src/component-library/Pages/Login/Login.stories.tsx
index 93ea7595b..676a6c4e3 100644
--- a/src/component-library/Pages/Login/Login.stories.tsx
+++ b/src/component-library/Pages/Login/Login.stories.tsx
@@ -57,6 +57,8 @@ LoginPage.args = {
         multiVOEnabled: true,
         voList: [voAtlas, voCMS],
         isLoggedIn: false,
+        accountsAvailable: undefined,
+        accountActive: undefined,
         rucioAuthHost: 'https://rucio.cern.ch',
     },
     authViewModel: {
diff --git a/src/component-library/Pages/Login/Login.tsx b/src/component-library/Pages/Login/Login.tsx
index d91f9f3ee..ace4a4260 100644
--- a/src/component-library/Pages/Login/Login.tsx
+++ b/src/component-library/Pages/Login/Login.tsx
@@ -12,9 +12,20 @@ import { Alert } from '../../Misc/Alert';
 import { LabelledInput } from './LabelledInput';
 import { DefaultVO } from '@/lib/core/entity/auth-models';
 import Modal from "react-modal";
-import { Dropdown } from '../../Input/Dropdown';
-import { H2 } from '../../Text/Headings/H2';
-import { P } from '../../Text/Content/P';
+import {Dropdown} from '../../Input/Dropdown';
+import {H2} from '../../Text/Headings/H2';
+import {P} from '../../Text/Content/P';
+import {HiArrowRight} from "react-icons/hi";
+import Link from "next/link";
+
+const BackToDashboardButton = (props: {account: string}) => {
+    return <Link href="/dashboard">
+        <Button className={twMerge(
+            "bg-base-success-600 hover:bg-base-success-700",
+            "mb-1"
+        )} icon={<HiArrowRight/>} label={`Back to dashboard as ${props.account}`}></Button>
+    </Link>
+}
 
 export type SupportedAuthWorkflows = "oidc" | "x509" | "userpass" | "none"
 
@@ -55,7 +66,7 @@ const MultipleAccountsModal = ({
             "border-2",
             "bg-neutral-0 dark:bg-neutral-800",
             "flex flex-col space-y-2 p-6",
-            "justify-center items-center overflow-hidden outline-none focus:outline-none"
+            "justify-center items-center overflow-y-visible outline-none focus:outline-none"
         )}
         contentLabel="Multiaccount Modal"
     >
@@ -90,6 +101,8 @@ export const Login = ({
     oidcSubmitHandler: handleOIDCSubmit,
 }: LoginPageProps) => {
 
+    const isLoggedIn = loginViewModel.isLoggedIn && loginViewModel.accountActive !== undefined
+
     const [showUserPassLoginForm, setShowUserPassLoginForm] = useState<boolean>(false)
 
     const [selectedVOTab, setSelectedVOTab] = useState<number>(1)
@@ -108,11 +121,21 @@ export const Login = ({
             setError(authViewModel.message)
         } else if (authViewModel.status === 'multiple_accounts') {
             const accounts = authViewModel.message?.split(',')
-            setAvailableAccounts(accounts ?? [])
+            const accountsFiltered = accounts?.filter(account => !loginViewModel.accountsAvailable?.includes(account))
+            if (!accountsFiltered || accountsFiltered.length === 0) {
+                setError('All accounts associated with this identity are signed in to')
+            } else {
+                setAvailableAccounts(accountsFiltered)
+            }
         }
     };
 
     const submitX509 = async (account: string | undefined) => {
+        if (account && loginViewModel.accountsAvailable?.includes(account)) {
+            setError(`Already authenticated as ${account}`)
+            return
+        }
+
         const vo = loginViewModel.voList[selectedVOTab] || DefaultVO
         const x509AuthViewModel = await handleX509Submit(vo, loginViewModel, account)
 
@@ -124,6 +147,11 @@ export const Login = ({
     };
 
     const submitUserPass = async (account: string | undefined) => {
+        if (account && loginViewModel.accountsAvailable?.includes(account)) {
+            setError(`Already authenticated as ${account}`)
+            return
+        }
+
         handleUserPassSubmit(username, password, loginViewModel.voList[selectedVOTab], account)
         setLastAuthMethod('userpass')
         return Promise.resolve()
@@ -137,8 +165,8 @@ export const Login = ({
         }
     }, [loginViewModel, authViewModel])
 
-    return (
-        <div
+    const getLoginForm = () => {
+        return <div
             className={twMerge(
                 "rounded p-4 flex flex-col justify-center space-y-2",
                 "border dark:border-2",
@@ -157,23 +185,25 @@ export const Login = ({
                     () => {
                         setError(undefined)
                     }
-                } />
+                }/>
             </Collapsible>
             <div className="text-center text-text-1000 dark:text-text-0">
-                <H1 className="mt-4 mb-2">Rucio Login</H1> 
+                <H1 className="mt-4 mb-2">Rucio Login</H1>
             </div>
 
             <div
                 className="flex flex-col space-y-2"
-                onSubmit={ (e) => { 
-                        e.preventDefault()
-                    }
+                onSubmit={(e) => {
+                    e.preventDefault()
+                }
                 } // TODO handle proper submit!
             >
                 <Tabs
                     tabs={loginViewModel.voList.map((vo) => vo.name)}
                     active={1}
-                    updateActive={(active: number) => { setSelectedVOTab(active) }}
+                    updateActive={(active: number) => {
+                        setSelectedVOTab(active)
+                    }}
                     className={twMerge(loginViewModel.multiVOEnabled ? "" : "hidden")}
                 />
 
@@ -181,38 +211,39 @@ export const Login = ({
                     className="flex justify-center flex-col space-y-4"
                     aria-label="Choose Login Method"
                 >
-                    { loginViewModel.oidcEnabled == true ?
-                    <div
-                        className={twMerge(
-                            "flex flex-row justify-center space-x-2",
-                            loginViewModel.voList[selectedVOTab].oidcEnabled ? "" : "hidden"
-                        )}
-                        aria-label="OIDC Login Buttons"
-                    >
-                        {loginViewModel.voList[selectedVOTab].oidcProviders.map((provider: OIDCProvider, index: number) => {
-                            return (<Button theme='orange' label={provider.name} key={index.toString()} icon={<MdAccountCircle />} />)
-                        })}
-                    </div>
-                    : <></>}
+                    {loginViewModel.oidcEnabled == true ?
+                        <div
+                            className={twMerge(
+                                "flex flex-row justify-center space-x-2",
+                                loginViewModel.voList[selectedVOTab].oidcEnabled ? "" : "hidden"
+                            )}
+                            aria-label="OIDC Login Buttons"
+                        >
+                            {loginViewModel.voList[selectedVOTab].oidcProviders.map((provider: OIDCProvider, index: number) => {
+                                return (<Button theme='orange' label={provider.name} key={index.toString()}
+                                                icon={<MdAccountCircle/>}/>)
+                            })}
+                        </div>
+                        : <></>}
 
                     <Button label="x509" onClick={() => submitX509(inputAccount)}/>
 
                     <Button label="Userpass" onClick={() => {
                         setShowUserPassLoginForm(!showUserPassLoginForm)
                     }
-                    } />
+                    }/>
                     <form>
-                    <fieldset
-                        className={twMerge(
-                            "flex flex-col space-y-2",
-                            "mx-2 md:mx-10",
-                            showUserPassLoginForm ? "" : "hidden",
-                        )}
-                        aria-label="Userpass Login Fields"
-                        id="userpass-form"
-                    >
-                        <div
-                            className={twMerge("flex flex-col space-y-1")}
+                        <fieldset
+                            className={twMerge(
+                                "flex flex-col space-y-2",
+                                "mx-2 md:mx-10",
+                                showUserPassLoginForm ? "" : "hidden",
+                            )}
+                            aria-label="Userpass Login Fields"
+                            id="userpass-form"
+                        >
+                            <div
+                                className={twMerge("flex flex-col space-y-1")}
 
                         >
                             <LabelledInput
@@ -255,7 +286,12 @@ export const Login = ({
                         />
                     </fieldset>
                 </div>
-            </div >
-        </div >
-    )
+            </div>
+        </div>
+    }
+
+    return isLoggedIn ? <div>
+        <BackToDashboardButton account={loginViewModel.accountActive!}/>
+        {getLoginForm()}
+    </div> : getLoginForm()
 }
diff --git a/src/component-library/outputtailwind.css b/src/component-library/outputtailwind.css
index 3c42f3953..3c1e9e3ca 100644
--- a/src/component-library/outputtailwind.css
+++ b/src/component-library/outputtailwind.css
@@ -958,10 +958,6 @@ html {
 .max-w-3xl {
   max-width: 48rem;
 }
-.min-w-full {
-  min-width: 100%;
-
-}
 
 .max-w-sm {
   max-width: 24rem;
@@ -1184,14 +1180,14 @@ html {
   align-self: center;
 }
 
-.overflow-hidden {
-  overflow: hidden;
-}
-
 .overflow-y-auto {
   overflow-y: auto;
 }
 
+.overflow-y-visible {
+  overflow-y: visible;
+}
+
 .overflow-y-scroll {
   overflow-y: scroll;
 }
@@ -1412,6 +1408,11 @@ html {
   background-color: rgb(34 197 94 / var(--tw-bg-opacity));
 }
 
+.bg-base-success-600 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(22 163 74 / var(--tw-bg-opacity));
+}
+
 .bg-base-warning-100 {
   --tw-bg-opacity: 1;
   background-color: rgb(254 243 199 / var(--tw-bg-opacity));
@@ -1646,10 +1647,10 @@ html {
   background-color: rgb(133 77 14 / var(--tw-bg-opacity));
 }
 
-
 .bg-opacity-50 {
   --tw-bg-opacity: 0.5;
 }
+
 .p-0 {
   padding: 0px;
 }
@@ -2213,11 +2214,21 @@ html {
   background-color: rgb(56 189 248 / var(--tw-bg-opacity));
 }
 
+.hover\:bg-base-success-200:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(187 247 208 / var(--tw-bg-opacity));
+}
+
 .hover\:bg-base-success-600:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(22 163 74 / var(--tw-bg-opacity));
 }
 
+.hover\:bg-base-success-700:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(21 128 61 / var(--tw-bg-opacity));
+}
+
 .hover\:bg-base-warning-200:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(253 230 138 / var(--tw-bg-opacity));
@@ -2796,6 +2807,11 @@ html {
     background-color: rgb(30 41 59 / var(--tw-bg-opacity));
   }
 
+  .dark\:hover\:bg-base-success-600:hover {
+    --tw-bg-opacity: 1;
+    background-color: rgb(22 163 74 / var(--tw-bg-opacity));
+  }
+
   .dark\:hover\:bg-base-warning-600:hover {
     --tw-bg-opacity: 1;
     background-color: rgb(217 119 6 / var(--tw-bg-opacity));
diff --git a/src/lib/infrastructure/data/view-model/login.d.ts b/src/lib/infrastructure/data/view-model/login.d.ts
index 122bf3015..e58fc976f 100644
--- a/src/lib/infrastructure/data/view-model/login.d.ts
+++ b/src/lib/infrastructure/data/view-model/login.d.ts
@@ -2,6 +2,8 @@ import { LoginConfigResponse } from "@/lib/core/usecase-models/login-config-usec
 
 export interface LoginViewModel extends LoginConfigResponse {
     isLoggedIn: boolean;
+    accountActive: string | undefined;
+    accountsAvailable: string[] | undefined;
     status: 'success' | 'error';
     message?: string;
     rucioAuthHost: string;
diff --git a/src/lib/infrastructure/presenter/login-config-presenter.ts b/src/lib/infrastructure/presenter/login-config-presenter.ts
index b09726cc7..cd9a4905c 100644
--- a/src/lib/infrastructure/presenter/login-config-presenter.ts
+++ b/src/lib/infrastructure/presenter/login-config-presenter.ts
@@ -27,6 +27,8 @@ export default class LoginConfigPresenter extends BasePresenter<LoginConfigRespo
             voList: responseModel.voList,
             oidcProviders: responseModel.oidcProviders,
             isLoggedIn: loggedIn,
+            accountActive: user?.rucioAccount,
+            accountsAvailable: this.session?.allUsers?.map(user => user.rucioAccount),
             rucioAuthHost: responseModel.rucioAuthHost,
         }
         return { viewModel, status: 200 };
@@ -41,6 +43,8 @@ export default class LoginConfigPresenter extends BasePresenter<LoginConfigRespo
             voList: [],
             oidcProviders: [],
             isLoggedIn: false,
+            accountActive: undefined,
+            accountsAvailable: undefined,
             message: errorModel.message,
             rucioAuthHost: '',
         }
diff --git a/src/pages/api/auth/switch.ts b/src/pages/api/auth/switch.ts
new file mode 100644
index 000000000..3820ce852
--- /dev/null
+++ b/src/pages/api/auth/switch.ts
@@ -0,0 +1,31 @@
+import {addOrUpdateSessionUser, withSessionRoute} from "@/lib/infrastructure/auth/session-utils"
+import { IronSession } from "iron-session"
+import { NextApiRequest, NextApiResponse } from "next"
+
+async function switchUsers(req: NextApiRequest, res: NextApiResponse) {
+    const session: IronSession = req.session
+    const { account, callbackUrl } = req.query
+
+    if (account === undefined) {
+        res.status(400).json({ message: 'Account is not specified' })
+        return
+    }
+
+    if (session.allUsers === undefined) {
+        res.status(400).json({ message: 'No authentications found' })
+        return
+    }
+
+    const userIdx = session.allUsers?.findIndex((sessionUser) => sessionUser.rucioAccount === account)
+
+    if (userIdx === -1) {
+        res.status(400).json({ message: 'No authentication found for the specified account' })
+        return
+    }
+
+    const user = session.allUsers?.at(userIdx!)
+    await addOrUpdateSessionUser(session, user!, true)
+    res.redirect(callbackUrl as string ?? '/')
+}
+
+export default withSessionRoute(switchUsers)
\ No newline at end of file
diff --git a/test/component/Login.test.tsx b/test/component/Login.test.tsx
index 7025b13b9..7ca53bb82 100644
--- a/test/component/Login.test.tsx
+++ b/test/component/Login.test.tsx
@@ -140,6 +140,8 @@ describe("Login Page Test", () => {
             multiVOEnabled: true,
             voList: getSampleVOs(),
             isLoggedIn: false,
+            accountActive: undefined,
+            accountsAvailable: undefined,
             status: "success",
             rucioAuthHost: "https://rucio-auth.cern.ch",
         }
@@ -185,6 +187,8 @@ describe("Login Page Test", () => {
             multiVOEnabled: true,
             voList: getSampleVOs(),
             isLoggedIn: false,
+            accountActive: undefined,
+            accountsAvailable: undefined,
             status: "success",
             rucioAuthHost: "https://rucio-auth.cern.ch",
         }
@@ -222,6 +226,8 @@ describe("Login Page Test", () => {
             multiVOEnabled: true,
             voList: getSampleVOs(),
             isLoggedIn: false,
+            accountActive: undefined,
+            accountsAvailable: undefined,
             status: "success",
             rucioAuthHost: "https://rucio-auth.cern.ch",
         }