diff --git a/builtin/mainmenu/pwmgr.lua b/builtin/mainmenu/pwmgr.lua
index 68a5050ef..c2cd48418 100644
--- a/builtin/mainmenu/pwmgr.lua
+++ b/builtin/mainmenu/pwmgr.lua
@@ -84,7 +84,7 @@ end
 local function get_disable_confirm_buttonhandler(this, fields)
 	if fields.pwd_confirm_disable then
 		-- Don't load pwmgr later
-		core.settings:set_bool("pwmgr.enable", false)
+		core.settings:set_bool("enable_pwmgr", false)
 		core.settings:write()
 
 		-- Delete the "pwmgr" global variable
diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
index c09c8743c..d9bf32f71 100644
--- a/builtin/mainmenu/tab_online.lua
+++ b/builtin/mainmenu/tab_online.lua
@@ -331,7 +331,8 @@ local function main_button_handler(tabview, fields, name, tabdata)
 		core.settings:set("address",     fields.te_address)
 		core.settings:set("remote_port", fields.te_port)
 
-		if core.settings:get_bool("enable_pwmgr") then
+		local enable_pwmgr = core.settings:get_bool("enable_pwmgr")
+		if enable_pwmgr or enable_pwmgr == nil then
 			if not rawget(_G, "pwmgr") then
 				dofile(core.get_mainmenu_path() .. DIR_DELIM .. "pwmgr.lua")
 			end