diff --git a/Menu/GameShell/10_Settings/Wifi/__init__.py b/Menu/GameShell/10_Settings/Wifi/__init__.py
index 7d929cf..7718143 100644
--- a/Menu/GameShell/10_Settings/Wifi/__init__.py
+++ b/Menu/GameShell/10_Settings/Wifi/__init__.py
@@ -13,7 +13,8 @@ except:
 def Init(main_screen):
     pages.InitPasswordPage(main_screen)
     pages.InitScanPage(main_screen)
-
+    myvars.PasswordPage._Caller = myvars.ScanPage
+    
 def API(main_screen):
     
     if main_screen != None:
diff --git a/Menu/GameShell/10_Settings/Wifi/wifi_list.py b/Menu/GameShell/10_Settings/Wifi/wifi_list.py
index 70677e8..dbdfe6c 100644
--- a/Menu/GameShell/10_Settings/Wifi/wifi_list.py
+++ b/Menu/GameShell/10_Settings/Wifi/wifi_list.py
@@ -550,7 +550,7 @@ class WifiList(Page):
         results = []
         activeID = -1
         for x,enc_type in enumerate(self._EncMethods):
-            if enc_type["type"] == self._Wireless.GetWirelessProperty(network_id,"encryption_method"):
+            if enc_type["type"] == self._Wireless.GetWirelessProperty(network_id,"enctype"):
                 activeID = x
                 break
 
@@ -608,10 +608,13 @@ class WifiList(Page):
         self._Screen.Draw()
         self._Screen.SwapAndShow()
 
-    def OnReturnBackCb(self):
+    def OnKbdReturnBackCb(self):
         password_inputed = "".join(myvars.PasswordPage._Textarea._MyWords)
         if is_wifi_connected_now() == False:
             self.ConfigWireless(password_inputed)
+            
+    def OnReturnBackCb(self):
+        pass
         
         
     def KeyDown(self,event):
diff --git a/sys.py/UI/keyboard.py b/sys.py/UI/keyboard.py
index cd75cd7..a9fb145 100644
--- a/sys.py/UI/keyboard.py
+++ b/sys.py/UI/keyboard.py
@@ -74,6 +74,7 @@ class Keyboard(Page):
     _FootMsg           = ["Nav.","ABC","Done","Backspace","Enter"]
 
     _RowIndex    = 0
+    _Caller   = None
     
     def __init__(self):
         self._Secs     = {}
@@ -317,6 +318,11 @@ class Keyboard(Page):
             print("".join(self._Textarea._MyWords))
             self.ReturnToUpLevelPage()
             self._Screen.SwapAndShow()
+            if self._Caller != None:
+                on_kbd_return_back_cb = getattr(self._Caller,"OnKbdReturnBackCb",None)
+                if on_kbd_return_back_cb != None:
+                    if callable( on_kbd_return_back_cb ):
+                        self._Caller.OnKbdReturnBackCb()
             #Uplevel page  invokes OnReturnBackCb,eg: ConfigWireless
 
         if event.key == CurKeys["A"]: