diff --git a/src/components/Login/index.tsx b/src/components/Login/index.tsx
index 56dd81e12..2f7a7e599 100644
--- a/src/components/Login/index.tsx
+++ b/src/components/Login/index.tsx
@@ -6,6 +6,7 @@ import { useRouter } from 'next/dist/client/router';
 import ImageFader from '../Common/ImageFader';
 import { defineMessages, FormattedMessage } from 'react-intl';
 import Transition from '../Transition';
+import LanguagePicker from '../Layout/LanguagePicker';
 
 const messages = defineMessages({
   signinplex: 'Sign in to continue',
@@ -59,7 +60,10 @@ const Login: React.FC = () => {
           '/images/rotate4.jpg',
         ]}
       />
-      <div className="px-4 sm:px-2 md:px-0 sm:mx-auto sm:w-full sm:max-w-md relative z-50">
+      <div className="absolute top-4 right-4 z-50">
+        <LanguagePicker />
+      </div>
+      <div className="px-4 sm:px-2 md:px-0 sm:mx-auto sm:w-full sm:max-w-md relative z-40">
         <img
           src="/logo.png"
           className="mx-auto max-h-32 w-auto"
diff --git a/src/components/Setup/index.tsx b/src/components/Setup/index.tsx
index 7fc0b2d6a..de9961fc6 100644
--- a/src/components/Setup/index.tsx
+++ b/src/components/Setup/index.tsx
@@ -9,6 +9,7 @@ import SetupSteps from './SetupSteps';
 import axios from 'axios';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import Badge from '../Common/Badge';
+import LanguagePicker from '../Layout/LanguagePicker';
 
 const messages = defineMessages({
   finish: 'Finish Setup',
@@ -51,7 +52,10 @@ const Setup: React.FC = () => {
           '/images/rotate4.jpg',
         ]}
       />
-      <div className="px-4 sm:px-2 md:px-0 sm:mx-auto sm:w-full sm:max-w-4xl relative z-50">
+      <div className="absolute top-4 right-4 z-50">
+        <LanguagePicker />
+      </div>
+      <div className="px-4 sm:px-2 md:px-0 sm:mx-auto sm:w-full sm:max-w-4xl relative z-40">
         <img
           src="/logo.png"
           className="mx-auto max-h-32 w-auto mb-10"