diff --git a/builtin/mainmenu/keyringmgr.lua b/builtin/mainmenu/keyringmgr.lua
index 79664052af..d02e70a93e 100644
--- a/builtin/mainmenu/keyringmgr.lua
+++ b/builtin/mainmenu/keyringmgr.lua
@@ -1,7 +1,5 @@
 keyringmgr = {
   keyring = nil,
-
-	general_login = false
 }
 
 --------------------------------------------------------------------------------
@@ -71,17 +69,6 @@ local function rewrite_keys(keyring, address, port, new_keys)
   save_keyring(keyring)
 end
 
---------------------------------------------------------------------------------
-local function set_general_login(address, port, playername)
-	local login = keyringmgr.get_login(address, port, playername)
-	if login then
-		keyringmgr.general_login = {
-			playername = login.playername,
-			password = login.password,
-		}
-	end
-end
-
 --------------------------------------------------------------------------------
 function keyringmgr.get_keyring()
 	if keyringmgr.keyring then
@@ -110,7 +97,6 @@ function keyringmgr.set_last_login(address, port, playername)
   new_keys.last_login = playername
 
   rewrite_keys(keyring, address, port, new_keys)
-	set_general_login(address, port, playername)
 end
 
 --------------------------------------------------------------------------------
@@ -190,20 +176,4 @@ function keyringmgr.get_last_login(address, port)
    return keyringmgr.get_login(address, port, playername)
   end
   return false
-end
-
---------------------------------------------------------------------------------
-function keyringmgr.get_last_playername()
-	if keyringmgr.general_login then
-		return keyringmgr.general_login.playername
-	end
-	return false
-end
-
---------------------------------------------------------------------------------
-function keyringmgr.get_last_password()
-	if keyringmgr.general_login then
-		return keyringmgr.general_login.password
-	end
-	return false
 end
\ No newline at end of file
diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
index e5e4fcd166..ad0802a840 100644
--- a/builtin/mainmenu/tab_online.lua
+++ b/builtin/mainmenu/tab_online.lua
@@ -56,12 +56,10 @@ end
 
 -- Persists the selected server in the "address" and "remote_port" settings
 local function get_default_playername()
-	print(keyringmgr.get_last_playername())
-	return keyringmgr.get_last_playername() or core.settings:get("name")
+	return core.settings:get("name")
 end
 local function get_default_password()
-	print(keyringmgr.get_last_password())
-	return keyringmgr.get_last_password() or ""
+	return ""
 end
 
 local input_playername = get_default_playername()