diff --git a/app/[lang]/(live)/@languageSwitcher/[...uri]/page.tsx b/app/[lang]/(live)/@languageSwitcher/[...uri]/page.tsx
index 50f322ad4..3eb711825 100644
--- a/app/[lang]/(live)/@languageSwitcher/[...uri]/page.tsx
+++ b/app/[lang]/(live)/@languageSwitcher/[...uri]/page.tsx
@@ -15,10 +15,10 @@ export default async function LanguageSwitcher({
   return (
     <>
       <section className={styles.desktop}>
-        <Desktop currentLanguage={params.lang} urls={urls} />
+        <Desktop currentLanguage={params.lang} urlObject={urls} />
       </section>
       <section className={styles.mobile}>
-        <Mobile currentLanguage={params.lang} urls={urls} />
+        <Mobile currentLanguage={params.lang} urlObject={urls} />
       </section>
     </>
   )
diff --git a/app/[lang]/(live-current)/@languageSwitcher/page.tsx b/app/[lang]/(live-current)/@languageSwitcher/page.tsx
index cf9e9c3f7..5a3787125 100644
--- a/app/[lang]/(live-current)/@languageSwitcher/page.tsx
+++ b/app/[lang]/(live-current)/@languageSwitcher/page.tsx
@@ -20,10 +20,10 @@ export default async function LanguageSwitcher({
   return (
     <>
       <section className={styles.desktop}>
-        <Desktop currentLanguage={params.lang} urls={urls} />
+        <Desktop currentLanguage={params.lang} urlObject={urls} />
       </section>
       <section className={styles.mobile}>
-        <Mobile currentLanguage={params.lang} urls={urls} />
+        <Mobile currentLanguage={params.lang} urlObject={urls} />
       </section>
     </>
   )
diff --git a/components/Current/Header/LanguageSwitcher/Desktop/desktop.module.css b/components/Current/Header/LanguageSwitcher/Desktop/desktop.module.css
index a1443735d..f4909883c 100644
--- a/components/Current/Header/LanguageSwitcher/Desktop/desktop.module.css
+++ b/components/Current/Header/LanguageSwitcher/Desktop/desktop.module.css
@@ -1,5 +1,6 @@
 .container {
   position: relative;
+
   font-family:
     Helvetica Neue,
     Helvetica,
@@ -7,7 +8,7 @@
     sans-serif;
 }
 
-.toggle {
+.languageSwitcher {
   display: flex;
   color: #fff;
   padding: 3px 15px;
diff --git a/components/Current/Header/LanguageSwitcher/Desktop/index.tsx b/components/Current/Header/LanguageSwitcher/Desktop/index.tsx
index 5c35a1daa..1145dec76 100644
--- a/components/Current/Header/LanguageSwitcher/Desktop/index.tsx
+++ b/components/Current/Header/LanguageSwitcher/Desktop/index.tsx
@@ -11,7 +11,7 @@ import type { LanguageSwitcherProps } from "@/types/components/current/languageS
 
 export default function Desktop({
   currentLanguage,
-  urls,
+  urlObject,
 }: LanguageSwitcherProps) {
   const [isOpen, setIsOpen] = useState(false)
   const divRef = useRef<HTMLDivElement>(null)
@@ -40,11 +40,26 @@ export default function Desktop({
     }
   }, [close])
 
+  const urls = Object.keys(urlObject)
+
+  if (urls.length <= 1 && urls[0] === currentLanguage) {
+    return (
+      <div className={styles.container} ref={divRef}>
+        <section className={styles.languageSwitcher}>
+          <svg focusable="false" className={styles.icon} viewBox="0 0 32 32">
+            <use xlinkHref="/_static/img/icons/sprites.svg#icon-globe"></use>
+          </svg>
+          {languages[currentLanguage]}
+        </section>
+      </div>
+    )
+  }
+
   return (
     <div className={styles.container} ref={divRef}>
       <button
         aria-pressed="false"
-        className={styles.toggle}
+        className={styles.languageSwitcher}
         onClick={toggleOpen}
       >
         <svg focusable="false" className={styles.icon} viewBox="0 0 32 32">
@@ -55,15 +70,15 @@ export default function Desktop({
         <span className={styles.caret}></span>
       </button>
       <ul className={`${styles.dropdown} ${isOpen ? styles.isOpen : ""}`}>
-        {Object.keys(urls).map((key) => {
-          const url = urls[key as Lang]?.url
+        {urls.map((key) => {
+          const url = urlObject[key as Lang]?.url
           if (url) {
             return (
               <li
                 key={key}
                 className={`${styles.li} ${currentLanguage === key ? styles.active : ""}`}
               >
-                {urls[key as Lang]?.isExternal ? (
+                {urlObject[key as Lang]?.isExternal ? (
                   <Link className={styles.link} href={url}>
                     {languages[key as Lang]}
                   </Link>
diff --git a/components/Current/Header/LanguageSwitcher/Mobile/index.tsx b/components/Current/Header/LanguageSwitcher/Mobile/index.tsx
index 916334216..0d19b3d34 100644
--- a/components/Current/Header/LanguageSwitcher/Mobile/index.tsx
+++ b/components/Current/Header/LanguageSwitcher/Mobile/index.tsx
@@ -9,19 +9,28 @@ import type { LanguageSwitcherProps } from "@/types/components/current/languageS
 
 export default function Mobile({
   currentLanguage,
-  urls,
+  urlObject,
 }: LanguageSwitcherProps) {
   const [isOpen, setIsOpen] = useState(false)
 
   function toggleOpen() {
     setIsOpen((prevIsOpen) => !prevIsOpen)
   }
+  const urls = Object.keys(urlObject)
+
+  if (urls.length <= 1 && urls[0] === currentLanguage) {
+    return (
+      <div className={styles.languageSwitcher}>
+        {languages[currentLanguage]}{" "}
+      </div>
+    )
+  }
 
   return (
     <div>
       <button
         aria-pressed="false"
-        className={styles.toggle}
+        className={styles.languageSwitcher}
         onClick={toggleOpen}
       >
         {languages[currentLanguage]}{" "}
@@ -29,8 +38,8 @@ export default function Mobile({
         <span className={styles.hiddenAccessible}>Choose language</span>
       </button>
       <ul className={`${styles.dropdown} ${isOpen ? styles.isOpen : ""}`}>
-        {Object.keys(urls).map((key) => {
-          const url = urls[key as Lang]?.url
+        {urls.map((key) => {
+          const url = urlObject[key as Lang]?.url
           if (url) {
             return (
               <li key={key} className={styles.li}>
diff --git a/components/Current/Header/LanguageSwitcher/Mobile/mobile.module.css b/components/Current/Header/LanguageSwitcher/Mobile/mobile.module.css
index aa2c70c93..7afa8f549 100644
--- a/components/Current/Header/LanguageSwitcher/Mobile/mobile.module.css
+++ b/components/Current/Header/LanguageSwitcher/Mobile/mobile.module.css
@@ -1,4 +1,5 @@
-.toggle {
+.languageSwitcher {
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 14px;
   padding: 5px 0;
   display: block;
diff --git a/lib/graphql/Query/AccountPage.graphql b/lib/graphql/Query/AccountPage.graphql
index 5f76dc4ae..d69fc2bbd 100644
--- a/lib/graphql/Query/AccountPage.graphql
+++ b/lib/graphql/Query/AccountPage.graphql
@@ -64,29 +64,35 @@ query GetAccountPageRefs($locale: String!, $uid: String!) {
 }
 
 query GetDaDeEnUrlsAccountPage($uid: String!) {
-  de: account_page(uid: $uid, locale: "de") {
-    url
+  de: all_account_page(where: { uid: $uid }, locale: "de") {
+    items {
+      url
+    }
   }
-  en: account_page(uid: $uid, locale: "en") {
-    url
+  en: all_account_page(where: { uid: $uid }, locale: "en") {
+    items {
+      url
+    }
   }
-  da: account_page(uid: $uid, locale: "da") {
-    url
+  da: all_account_page(where: { uid: $uid }, locale: "da") {
+    items {
+      url
+    }
   }
 }
 
 query GetFiNoSvUrlsAccountPage($uid: String!) {
-  fi: account_page(uid: $uid, locale: "fi") {
+  fi: all_account_page(where: { uid: $uid }, locale: "fi") {
     items {
       url
     }
   }
-  no: account_page(uid: $uid, locale: "no") {
+  no: all_account_page(where: { uid: $uid }, locale: "no") {
     items {
       url
     }
   }
-  sv: account_page(uid: $uid, locale: "sv") {
+  sv: all_account_page(where: { uid: $uid }, locale: "sv") {
     items {
       url
     }
diff --git a/server/routers/contentstack/config/input.ts b/server/routers/contentstack/config/input.ts
deleted file mode 100644
index c1223b25b..000000000
--- a/server/routers/contentstack/config/input.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import z from "zod"
-
-import { Lang } from "@/constants/languages"
-
-export const headerInput = z
-  .object({
-    lang: z.nativeEnum(Lang),
-  })
-  .optional()
diff --git a/types/components/current/languageSwitcher.ts b/types/components/current/languageSwitcher.ts
index e29bb4cff..4b1e8b0f4 100644
--- a/types/components/current/languageSwitcher.ts
+++ b/types/components/current/languageSwitcher.ts
@@ -9,5 +9,5 @@ export type LanguageSwitcherLink = {
 
 export type LanguageSwitcherProps = {
   currentLanguage: Lang
-  urls: LanguageSwitcherData
+  urlObject: LanguageSwitcherData
 }