diff --git a/web/src/components/auth/LoginForm.js b/web/src/components/auth/LoginForm.js
index 1e92b5ff..b9c62eef 100644
--- a/web/src/components/auth/LoginForm.js
+++ b/web/src/components/auth/LoginForm.js
@@ -294,7 +294,7 @@ const LoginForm = () => {
                     theme='outline'
                     className="w-full h-12 flex items-center justify-center !rounded-full border border-gray-200 hover:bg-gray-50 transition-colors"
                     type="tertiary"
-                    icon={<IconGithubLogo size="large" style={{ color: '#24292e' }} />}
+                    icon={<IconGithubLogo size="large" />}
                     size="large"
                     onClick={handleGitHubClick}
                     loading={githubLoading}
@@ -353,7 +353,7 @@ const LoginForm = () => {
                   onClick={handleEmailLoginClick}
                   loading={emailLoginLoading}
                 >
-                  <span className="ml-3">{t('使用 邮箱 登录')}</span>
+                  <span className="ml-3">{t('使用 邮箱或用户名 登录')}</span>
                 </Button>
               </div>
 
@@ -395,8 +395,8 @@ const LoginForm = () => {
               <Form className="space-y-3">
                 <Form.Input
                   field="username"
-                  label={t('邮箱')}
-                  placeholder={t('请输入您的邮箱地址')}
+                  label={t('用户名或邮箱')}
+                  placeholder={t('请输入您的用户名或邮箱地址')}
                   name="username"
                   size="large"
                   className="!rounded-md"
diff --git a/web/src/components/auth/RegisterForm.js b/web/src/components/auth/RegisterForm.js
index 7bc171c6..217d4bcb 100644
--- a/web/src/components/auth/RegisterForm.js
+++ b/web/src/components/auth/RegisterForm.js
@@ -300,7 +300,7 @@ const RegisterForm = () => {
                     theme='outline'
                     className="w-full h-12 flex items-center justify-center !rounded-full border border-gray-200 hover:bg-gray-50 transition-colors"
                     type="tertiary"
-                    icon={<IconGithubLogo size="large" style={{ color: '#24292e' }} />}
+                    icon={<IconGithubLogo size="large" />}
                     size="large"
                     onClick={handleGitHubClick}
                     loading={githubLoading}
@@ -359,7 +359,7 @@ const RegisterForm = () => {
                   onClick={handleEmailRegisterClick}
                   loading={emailRegisterLoading}
                 >
-                  <span className="ml-3">{t('使用 邮箱 注册')}</span>
+                  <span className="ml-3">{t('使用 用户名 注册')}</span>
                 </Button>
               </div>
 
diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
index e0575264..3f2822a2 100644
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -6,15 +6,15 @@
   "或": "or",
   "登 录": "Log In",
   "注 册": "Sign Up",
-  "使用 邮箱 登录": "Sign in with Email",
+  "使用 邮箱或用户名 登录": "Sign in with Email or Username",
   "使用 GitHub 继续": "Continue with GitHub",
   "使用 OIDC 继续": "Continue with OIDC",
   "使用 微信 继续": "Continue with WeChat",
   "使用 LinuxDO 继续": "Continue with LinuxDO",
-  "使用 邮箱 注册": "Sign up with Email",
+  "使用 用户名 注册": "Sign up with Username",
   "其他登录选项": "Other login options",
   "其他注册选项": "Other registration options",
-  "请输入您的邮箱地址": "Please enter your email address",
+  "请输入您的用户名或邮箱地址": "Please enter your username or email address",
   "请输入您的密码": "Please enter your password",
   "继续": "Continue",
   "%d 点额度": "%d point quota",
@@ -585,7 +585,7 @@
   "您正在使用默认密码！": "You are using the default password!",
   "请立刻修改默认密码！": "Please change the default password immediately!",
   "请输入用户名和密码！": "Please enter username and password!",
-  "用户名/邮箱": "Username/email",
+  "用户名或邮箱": "Username or email",
   "微信扫码登录": "WeChat scan code to log in",
   "刷新成功": "Refresh successful",
   "刷新失败": "Refresh failed",