diff --git a/platformcode/xbmc_config_menu.py b/platformcode/xbmc_config_menu.py
index 37a557fb..c7d91adf 100644
--- a/platformcode/xbmc_config_menu.py
+++ b/platformcode/xbmc_config_menu.py
@@ -171,7 +171,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog):
         if not self.list_controls:
 
             # If the channel path is in the "channels" folder, we get the controls and values using chaneltools
-            if os.path.join(config.get_runtime_path(), "channels") or os.path.join(config.get_runtime_path(), "specials") in channelpath:
+            if os.path.join(config.get_runtime_path(), "channels") in channelpath or os.path.join(config.get_runtime_path(), "specials") in channelpath:
 
                 # The call is made from a channel
                 self.list_controls, default_values = channeltools.get_channel_controls_settings(self.channel)
diff --git a/servers/hdmario.json b/servers/hdmario.json
index 6165244b..bb80a103 100644
--- a/servers/hdmario.json
+++ b/servers/hdmario.json
@@ -40,8 +40,8 @@
     {
       "default": "",
       "enabled": true,
-      "id": "email",
-      "label": "email",
+      "id": "username",
+      "label": "username",
       "type": "text",
       "visible": true
     },
diff --git a/servers/hdmario.py b/servers/hdmario.py
index 253f04ad..27bb27e9 100644
--- a/servers/hdmario.py
+++ b/servers/hdmario.py
@@ -52,8 +52,6 @@ def registerOrLogin(page_url, forced=False):
                                                                 'password': randPsw,
                                                                 'password_confirmation': randPsw}).url
                 if rq:
-                    from core import support
-                    support.dbg()
                     config.set_setting('username', randEmail, server='hdmario')
                     config.set_setting('password', randPsw, server='hdmario')
                     platformtools.dialog_ok('HDmario',