diff --git a/cfg/config.json.template b/cfg/config.json.template
index a5a64a7..397ce04 100644
--- a/cfg/config.json.template
+++ b/cfg/config.json.template
@@ -12,15 +12,15 @@
     "mail":"foo@bar.com",
     "enable_cq_filter":"n",
     "telnet": {
-        "host": "mysite",
-        "port": "7300",
-        "user": "myuser",
-        "password": ""
+        "telnet_host": "mysite",
+        "telnet_port": "7300",
+        "telnet_user": "myuser",
+        "telnet_password": ""
     },
         "menu": {
           "menu_list": [
             {"label":"Charts & stats", "link": "/plots.html", "external": false},
-            {"label": "Propagation", "link": "/propagation.html", "external": false},              
+            {"label":"Propagation", "link": "/propagation.html", "external": false},              
             {"label":"Sources", "link": "https://github.com/coulisse/spiderweb/" , "external": true},    
             {"label":"Cookies", "link": "/cookies.html", "external": false},
             {"label":"Privacy", "link": "/privacy.html", "external": false}
diff --git a/webapp.py b/webapp.py
index 40fd75b..ebc4fae 100644
--- a/webapp.py
+++ b/webapp.py
@@ -173,10 +173,10 @@ def spotlist():
 
 
 def who_is_connected():
-    host=cfg["telnet"]["host"]
-    port=cfg["telnet"]["port"]
-    user=cfg["telnet"]["user"]
-    password=cfg["telnet"]["password"]
+    host=cfg["telnet"]["telnet_host"]
+    port=cfg["telnet"]["telnet_port"]
+    user=cfg["telnet"]["telnet_user"]
+    password=cfg["telnet"]["telnet_password"]
     response = who(host, port, user, password)
     logger.debug("list of connected clusters:")
     logger.debug(response)
@@ -208,7 +208,7 @@ def spots():
             "index.html",
             inline_script_nonce=get_nonce(),
             mycallsign=cfg["mycallsign"],
-            telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
+            telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
             mail=cfg["mail"],
             menu_list=cfg["menu"]["menu_list"],
             visits=len(visits),            
@@ -266,7 +266,7 @@ def plots():
             "plots.html",
             inline_script_nonce=get_nonce(),          
             mycallsign=cfg["mycallsign"],
-            telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
+            telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
             mail=cfg["mail"],
             menu_list=cfg["menu"]["menu_list"],
             visits=len(visits),                     
@@ -298,7 +298,7 @@ def propagation():
             "propagation.html",
             inline_script_nonce=get_nonce(),          
             mycallsign=cfg["mycallsign"],
-            telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
+            telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
             mail=cfg["mail"],
             menu_list=cfg["menu"]["menu_list"],
             visits=len(visits),                     
@@ -316,7 +316,7 @@ def cookies():
             "cookies.html",
             inline_script_nonce=get_nonce(),          
             mycallsign=cfg["mycallsign"],
-            telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
+            telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
             mail=cfg["mail"],
             menu_list=cfg["menu"]["menu_list"],
             visits=len(visits),                     
@@ -331,7 +331,7 @@ def privacy():
             "privacy.html",
             inline_script_nonce=get_nonce(),          
             mycallsign=cfg["mycallsign"],
-            telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
+            telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
             mail=cfg["mail"],
             menu_list=cfg["menu"]["menu_list"],
             visits=len(visits),                     
@@ -353,7 +353,7 @@ def callsign():
             "callsign.html",
             inline_script_nonce=get_nonce(),              
             mycallsign=cfg["mycallsign"],
-            telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
+            telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
             mail=cfg["mail"],
             menu_list=cfg["menu"]["menu_list"],
             visits=len(visits),