diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 842f6b1c..0580fc11 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -1,9 +1,11 @@
 import React, { useState, useEffect } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
-import { Wifi, WifiOff, Eye, EyeOff, Server } from 'lucide-react';
+import { Wifi, WifiOff, Eye, EyeOff, Server, Globe } from 'lucide-react';
 import { useAuthStore } from '../store/authStore';
 import { pingWithCredentials, scheduleInstantMixProbeForServer } from '../api/subsonic';
 import { useTranslation } from 'react-i18next';
+import i18n from '../i18n';
+import CustomSelect from '../components/CustomSelect';
 import {
   decodeServerMagicString,
   DECODED_PASSWORD_VISUAL_MASK,
@@ -168,6 +170,23 @@ export default function Login() {
     <div className="login-page">
       <div className="login-bg" aria-hidden="true" />
       <div className="login-card animate-fade-in">
+        <div className="login-lang-picker" aria-label={t('settings.language')}>
+          <Globe size={14} aria-hidden="true" />
+          <CustomSelect
+            value={i18n.language}
+            onChange={v => i18n.changeLanguage(v)}
+            options={[
+              { value: 'en', label: t('settings.languageEn') },
+              { value: 'de', label: t('settings.languageDe') },
+              { value: 'es', label: t('settings.languageEs') },
+              { value: 'fr', label: t('settings.languageFr') },
+              { value: 'nl', label: t('settings.languageNl') },
+              { value: 'nb', label: t('settings.languageNb') },
+              { value: 'ru', label: t('settings.languageRu') },
+              { value: 'zh', label: t('settings.languageZh') },
+            ]}
+          />
+        </div>
         <div className="login-logo">
           <PsysonicLogo />
         </div>
diff --git a/src/styles/components.css b/src/styles/components.css
index 0a7a4db5..67c4a39f 100644
--- a/src/styles/components.css
+++ b/src/styles/components.css
@@ -4134,6 +4134,33 @@
   margin-bottom: var(--space-5);
 }
 
+.login-lang-picker {
+  position: absolute;
+  top: var(--space-3);
+  right: var(--space-3);
+  display: flex;
+  align-items: center;
+  gap: var(--space-1);
+  color: var(--text-muted);
+  z-index: 2;
+}
+
+.login-lang-picker > button {
+  font-size: 12px;
+  padding: 4px 8px;
+  background: transparent;
+  border: 1px solid transparent;
+  color: var(--text-muted);
+  width: auto;
+  min-width: 110px;
+}
+
+.login-lang-picker > button:hover {
+  background: var(--bg-hover);
+  border-color: var(--border-subtle);
+  color: var(--text-primary);
+}
+
 .login-title {
   text-align: center;
   font-family: var(--font-display);