diff --git a/apps/desktop/layer/renderer/src/modules/auth/LoginModalContent.tsx b/apps/desktop/layer/renderer/src/modules/auth/LoginModalContent.tsx
index f16fb08f0..34a4061a5 100644
--- a/apps/desktop/layer/renderer/src/modules/auth/LoginModalContent.tsx
+++ b/apps/desktop/layer/renderer/src/modules/auth/LoginModalContent.tsx
@@ -144,7 +144,7 @@ export const LoginModalContent = (props: LoginModalContentProps) => {
                   <span>{t("login.continueWith", { provider: provider.name })}</span>
                   {lastMethod === key && (
                     <div className="absolute -right-2 -top-2 rounded-xl bg-accent px-2 py-0.5 text-sm text-white">
-                      Last used
+                      {t("login.lastUsed")}
                     </div>
                   )}
                 </MotionButtonBase>
diff --git a/apps/ssr/client/lib/auth.ts b/apps/ssr/client/lib/auth.ts
index 3f74cafda..e9bb192b7 100644
--- a/apps/ssr/client/lib/auth.ts
+++ b/apps/ssr/client/lib/auth.ts
@@ -21,6 +21,7 @@ export const {
   changePassword,
   forgetPassword,
   getAccountInfo,
+  getLastUsedLoginMethod,
   getProviders,
   getSession,
   linkSocial,
diff --git a/apps/ssr/client/modules/login/index.tsx b/apps/ssr/client/modules/login/index.tsx
index 475251d93..7cbf34a91 100644
--- a/apps/ssr/client/modules/login/index.tsx
+++ b/apps/ssr/client/modules/login/index.tsx
@@ -1,5 +1,11 @@
 import { UserAvatar } from "@client/components/ui/user-avatar"
-import { loginHandler, oneTimeToken, signOut, twoFactor } from "@client/lib/auth"
+import {
+  getLastUsedLoginMethod,
+  loginHandler,
+  oneTimeToken,
+  signOut,
+  twoFactor,
+} from "@client/lib/auth"
 import { openInFollowApp } from "@client/lib/helper"
 import { queryClient } from "@client/lib/query-client"
 import { useSession } from "@client/query/auth"
@@ -66,6 +72,17 @@ export function Login() {
   const [callbackUrl, setCallbackUrl] = useState<string>()
   const callbackUrlWithScheme = callbackUrl ? `${DEEPLINK_SCHEME}${callbackUrl}` : undefined
 
+  const [lastMethod, setLastMethod] = useState<string | null>(null)
+  useEffect(() => {
+    let lastMethodValue = getLastUsedLoginMethod()
+    if (lastMethodValue === "email") {
+      lastMethodValue = "credential"
+    }
+    if (lastMethodValue) {
+      setLastMethod(lastMethodValue)
+    }
+  }, [lastMethod])
+
   const handleOpenApp = useCallback(async () => {
     const callbackUrl = await getCallbackUrl()
     if (!callbackUrl) return
@@ -168,7 +185,7 @@ export function Login() {
                         loginHandler(key, "app")
                       }
                     }}
-                    className="center relative w-full gap-2 rounded-xl border p-2.5 pl-5 font-semibold duration-200 hover:bg-material-medium"
+                    className="center relative w-full gap-2 rounded-xl border py-3 pl-5 font-semibold duration-200 hover:bg-material-medium"
                   >
                     <img
                       className={cn(
@@ -179,6 +196,11 @@ export function Login() {
                       src={isDark ? provider.iconDark64 || provider.icon64 : provider.icon64}
                     />
                     <span>{t("login.continueWith", { provider: provider.name })}</span>
+                    {lastMethod === key && (
+                      <div className="absolute -right-2 -top-2 rounded-xl bg-accent px-2 py-0.5 text-sm text-white">
+                        {t("login.lastUsed")}
+                      </div>
+                    )}
                   </MotionButtonBase>
                 ))}
               </div>
@@ -219,6 +241,7 @@ export function Login() {
     openFailed,
     callbackUrl,
     isDark,
+    lastMethod,
   ])
   const Content = useMemo(() => {
     switch (true) {
diff --git a/locales/app/en.json b/locales/app/en.json
index fa8de28cd..562a97568 100644
--- a/locales/app/en.json
+++ b/locales/app/en.json
@@ -246,6 +246,7 @@
   "login.enter_token": "Enter authorization token to continue",
   "login.forget_password.note": "Forgot your password?",
   "login.have_account": "Already have an account? <strong>Sign in</strong>",
+  "login.lastUsed": "Last used",
   "login.no_account": "Don't have an account? <strong>Sign up</strong>",
   "login.or": "OR",
   "login.password": "Password",
diff --git a/locales/app/zh-CN.json b/locales/app/zh-CN.json
index 9ce948407..be9c649ac 100644
--- a/locales/app/zh-CN.json
+++ b/locales/app/zh-CN.json
@@ -244,6 +244,7 @@
   "login.enter_token": "输入授权令牌以继续",
   "login.forget_password.note": "忘记了密码？",
   "login.have_account": "已有账户？<strong>登录</strong>",
+  "login.lastUsed": "上次使用",
   "login.no_account": "没有账户？<strong>注册</strong>",
   "login.or": "或",
   "login.password": "密码",
diff --git a/locales/external/en.json b/locales/external/en.json
index 63d056717..b4e55e171 100644
--- a/locales/external/en.json
+++ b/locales/external/en.json
@@ -50,6 +50,7 @@
   "login.forget_password.note": "Forgot your password?",
   "login.forget_password.success": "Email has been sent successfully",
   "login.have_account": "Already have an account? <strong>Sign in</strong>",
+  "login.lastUsed": "Last used",
   "login.logInTo": "Sign in to",
   "login.logInWithEmail": "Sign in with email",
   "login.new_password.label": "New Password",
diff --git a/locales/external/zh-CN.json b/locales/external/zh-CN.json
index 08b915586..19c75a097 100644
--- a/locales/external/zh-CN.json
+++ b/locales/external/zh-CN.json
@@ -50,6 +50,7 @@
   "login.forget_password.note": "忘记了密码？",
   "login.forget_password.success": "邮件已成功发送。",
   "login.have_account": "已有账户？<strong>登录</strong>",
+  "login.lastUsed": "上次使用",
   "login.logInTo": "登录 ",
   "login.logInWithEmail": "使用邮件地址登录",
   "login.new_password.label": "新密码",