diff --git a/src/views/App.jsx b/src/views/App.jsx
index 2ef5bce..0ff7fa7 100644
--- a/src/views/App.jsx
+++ b/src/views/App.jsx
@@ -5,7 +5,6 @@ import { DownOutlined } from '@ant-design/icons';
 import 'antd/dist/reset.css';
 import AppLogo from '@/assets/logo-gh.png';
 import { isEmpty } from '@/utils/commons';
-import Language from '../i18n/LanguageSwitcher';
 import { useTranslation } from 'react-i18next';
 import zhLocale from 'antd/locale/zh_CN';
 import enLocale from 'antd/locale/en_US';
@@ -158,9 +157,6 @@ function App() {
 									</a>
 								</Dropdown>
 							</Col>
-							<Col span={2}>
-                <Language />
-							</Col>
 						</Row>
 					</Header>
 					<Content className='p-6 m-0 min-h-72 bg-white'>
diff --git a/src/views/Login.jsx b/src/views/Login.jsx
index 5c1ee55..a8bcc71 100644
--- a/src/views/Login.jsx
+++ b/src/views/Login.jsx
@@ -1,18 +1,21 @@
 import { useNavigate } from 'react-router-dom'
 import { useEffect } from 'react'
-import { Button, Form, Input, Row, App } from 'antd'
+import { Button, Form, Input, Row, Radio, App } from 'antd'
 import { useTranslation } from 'react-i18next'
 import useAuthStore from '@/stores/Auth'
+import { appendRequestParams } from '@/utils/request'
 
 function Login() {
   const [authenticate, loginStatus, defaultRoute] =
     useAuthStore((state) => [state.authenticate, state.loginStatus, state.defaultRoute])
 
-  const { t } = useTranslation()
+  const { t, i18n } = useTranslation()
   const { notification } = App.useApp()
   const navigate = useNavigate()
   const [form] = Form.useForm()
 
+  const defaultLng = localStorage.getItem('i18nextLng')??'zh'
+
   useEffect (() => {
     if (loginStatus === 302) {
       navigate(defaultRoute)
@@ -36,6 +39,11 @@ function Login() {
     console.log('Failed:', errorInfo);
   }
 
+  const handleLngChange = (e) => {
+    appendRequestParams('lgc', e.target.value === 'zh' ? 2 : 1)
+    i18n.changeLanguage(e.target.value)
+  }
+
   return (
     <Row justify='center' align='middle' className='min-h-96'>
       <Form
@@ -51,7 +59,7 @@ function Login() {
         }}
         className='max-w-xl'
         initialValues={{
-          remember: true,
+          language: defaultLng,
         }}
         onFinish={onFinish}
         onFinishFailed={onFinishFailed}
@@ -81,8 +89,13 @@ function Login() {
         >
           <Input.Password />
         </Form.Item>
-        <Form.Item
-        >
+        <Form.Item name='language'>
+          <Radio.Group onChange={handleLngChange}>
+            <Radio value='zh'>中文</Radio>
+            <Radio value='en'>English</Radio>
+          </Radio.Group>
+        </Form.Item>
+        <Form.Item>
           <Button type='primary' htmlType='submit' className='w-full'>
             {t('Login')}
           </Button>
diff --git a/src/views/Standlone.jsx b/src/views/Standlone.jsx
index 6ce6113..7b80efa 100644
--- a/src/views/Standlone.jsx
+++ b/src/views/Standlone.jsx
@@ -28,9 +28,6 @@ function Standlone() {
               <img src={AppLogo} className='float-left h-9 my-4 mr-6 ml-0 bg-white/30' alt='App logo' />
 							</Col>
 							<Col span={5}><h1 className='text-white text-center'>Global Highlights Hub</h1></Col>
-							<Col span={2}>
-                <Language />
-							</Col>
 						</Row>
 					</Header>
 					<Content className='p-6 m-0 min-h-72 bg-white'>