diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua
index c4dabf6c..54e79d0c 100644
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -602,6 +602,7 @@ return{
 			register="Register",
 			email="E-mail Address",
 			password="Password",
+			keepPW="Remember me",
 			login="Log In",
 		},
 		register={
diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua
index 3aad9e8b..63342e30 100644
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -509,6 +509,7 @@ return{
 			register="Enregistrement",
 			email="E-mail",
 			password="Mot de passe",
+			-- keepPW="Remember me",
 			login="Connexion",
 		},
 		register={
diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua
index ec225071..f723a085 100644
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -599,6 +599,7 @@ return{
 			register="Registrar",
 			email="Endereço De Email",
 			password="Senha",
+			-- keepPW="Remember me",
 			login="Log in",
 		},
 		register={
diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua
index 3358fb3e..91cb39bf 100644
--- a/parts/language/lang_sp.lua
+++ b/parts/language/lang_sp.lua
@@ -513,6 +513,7 @@ return{
 			register="Registrarse",
 			email="Correo Elec.",
 			password="Contraseña",
+			-- keepPW="Remember me",
 			login="Entrar",
 		},
 		register={
diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua
index 5df3380b..66ca30d3 100644
--- a/parts/language/lang_symbol.lua
+++ b/parts/language/lang_symbol.lua
@@ -443,6 +443,7 @@ return{
 			register="Sign up",
 			email="@",
 			password="*",
+			-- keepPW="I",
 			login="Log in",
 		},
 		register={
diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua
index 9081ab21..2ac084ef 100644
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -600,6 +600,7 @@ return{
 			register="注册",
 			email="邮箱",
 			password="密码",
+			keepPW="保存密码",
 			login="登录",
 		},
 		register={
diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua
index f712ca38..14f8625c 100644
--- a/parts/scenes/login.lua
+++ b/parts/scenes/login.lua
@@ -1,21 +1,42 @@
+local emailBox=WIDGET.newInputBox{name="email",x=380,y=200,w=500,h=60}
+local passwordBox=WIDGET.newInputBox{name="password",x=380,y=300,w=620,h=60,secret=true,regex="[ -~]"}
+
+local savePW=false
+
 local function login()
-	local email=	WIDGET.active.email.value
-	local password=	WIDGET.active.password.value
+	local email,password=emailBox.value,passwordBox.value
 	if not STRING.simpEmailCheck(email)then
 		LOG.print(text.wrongEmail)return
 	elseif #password==0 then
 		LOG.print(text.noPassword)return
 	end
 	NET.wsconn_user_pswd(email,password)
+	if savePW then
+		FILE.save({email,password},"conf/account",'q')
+	else
+		if love.filesystem.getInfo("conf/account")then
+			love.filesystem.remove("conf/account")
+		end
+	end
 end
 
 local scene={}
 
+function scene.sceneInit()
+	local data=FILE.load("conf/account")
+	if data then
+		savePW=true
+		emailBox.value=data[1]
+		passwordBox.value=data[2]
+	end
+end
+
 scene.widgetList={
 	WIDGET.newText{name="title",		x=80,	y=50,font=70,align='L'},
 	WIDGET.newButton{name="register",	x=1140,	y=100,w=170,h=80,color='lY',code=function()SCN.swapTo('register','swipeR')end},
-	WIDGET.newInputBox{name="email",	x=380,	y=200,w=500,h=60},
-	WIDGET.newInputBox{name="password",	x=380,	y=300,w=626,h=60,secret=true,regex="[ -~]"},
+	emailBox,
+	passwordBox,
+	WIDGET.newSwitch{name="keepPW",		x=900,y=420,disp=function()return savePW end,code=function()savePW=not savePW end},
 	WIDGET.newKey{name="login",			x=1140,	y=540,w=170,h=80,font=40,code=login},
 	WIDGET.newButton{name="back",		x=1140,	y=640,w=170,h=80,font=40,code=backScene},
 }
diff --git a/parts/updateLog.lua b/parts/updateLog.lua
index fc59bbcc..ba141a15 100644
--- a/parts/updateLog.lua
+++ b/parts/updateLog.lua
@@ -32,8 +32,9 @@ return STRING.split([=[
 				新增垃圾行缓冲条总数警告
 				添加模式环境变量bufferLimit,攻击缓冲上限可以调整
 				添加模式环境变量maxOver,允许超屏最大高度可以调整
-				添加两个虚拟按键预设槽位
 				玩家个人信息栏下部显示在线玩家数量
+				登陆界面可以选择记住密码
+				添加两个虚拟按键预设槽位
 		改动:
 				词典新增两个游戏词条
 				更换细一点的字体