diff --git a/esp-link/main.c b/esp-link/main.c
index 8315ff9..d70e86a 100644
--- a/esp-link/main.c
+++ b/esp-link/main.c
@@ -97,8 +97,7 @@ HttpdBuiltInUrl builtInUrls[] = {
   { "/services/info", cgiServicesInfo, NULL },
   { "/services/update", cgiServicesSet, NULL },
   { "/pins", cgiPins, NULL },
-  { "/telnet/info", cgiTelnet, NULL},
-  { "/telnet/update", cgiTelnet, NULL},
+  { "/telnet", cgiTelnet, NULL},
 #ifdef MQTT
   { "/mqtt", cgiMqtt, NULL },
 #endif
diff --git a/html/ui.js b/html/ui.js
index 810d96a..f4f1cd9 100644
--- a/html/ui.js
+++ b/html/ui.js
@@ -314,7 +314,7 @@ function showTelnetInfo(data) {
 }
 
 function getTelnetInfo() {
-  ajaxJson('GET', "/telnet/info", showTelnetInfo,
+  ajaxJson('GET', "/telnet", showTelnetInfo,
       function(s, st) { window.setTimeout(getTelnetInfo, 1000); });
 }
 
@@ -339,6 +339,8 @@ function makeAjaxInput(klass, field) {
     var eon = $(".edit-on", div);
     var eoff = $(".edit-off", div)[0];
     var url = "/"+klass+"/update?"+field;
+    //Dirty fix to avoid to seperate name spaces to GET or PUT telnet ports
+    if (klass == "telnet") { var url = "/"+klass+"?"+field; }
 
     if (eoff === undefined || eon == undefined) return;