diff --git a/web/js/main.js b/web/js/main.js
index 858b72e1..3e95056c 100755
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -1,20 +1,21 @@
 // application constants
-var URL_HOST_BASE 	= window.location.hostname;
-var URL_AHRS_ORIENT     = "http://" + URL_HOST_BASE + "/orientAHRS";
-var URL_AHRS_CAGE       = "http://" + URL_HOST_BASE + "/cageAHRS";
-var URL_DELETELOGFILE   = "http://" + URL_HOST_BASE + "/deletelogfile";
-var URL_DEV_TOGGLE_GET  = "http://" + URL_HOST_BASE + "/develmodetoggle";
-var URL_DOWNLOADLOGFILE = "http://" + URL_HOST_BASE + "/downloadlog";
-var URL_DOWNLOADDB      = "http://" + URL_HOST_BASE + "/downloaddb";
-var URL_REBOOT		= "http://" + URL_HOST_BASE + "/reboot";
-var URL_RESTARTAPP      = "http://" + URL_HOST_BASE + "/restart";
-var URL_SATELLITES_GET	= "http://" + URL_HOST_BASE + "/getSatellites";
-var URL_SETTINGS_GET 	= "http://" + URL_HOST_BASE + "/getSettings";
-var URL_SETTINGS_SET 	= "http://" + URL_HOST_BASE + "/setSettings";
-var URL_STATUS_GET 	= "http://" + URL_HOST_BASE + "/getStatus";
-var URL_SHUTDOWN	= "http://" + URL_HOST_BASE + "/shutdown";
-var URL_TOWERS_GET 	= "http://" + URL_HOST_BASE + "/getTowers";
-var URL_UPDATE_UPLOAD	= "http://" + URL_HOST_BASE + "/updateUpload";
+var URL_HOST_PROTOCOL = window.location.protocol + "//";
+var URL_HOST_BASE = window.location.hostname+(window.location.port ? ':'+window.location.port: '');
+var URL_AHRS_ORIENT     = URL_HOST_PROTOCOL + URL_HOST_BASE + "/orientAHRS";
+var URL_AHRS_CAGE       = URL_HOST_PROTOCOL + URL_HOST_BASE + "/cageAHRS";
+var URL_DELETELOGFILE   = URL_HOST_PROTOCOL + URL_HOST_BASE + "/deletelogfile";
+var URL_DEV_TOGGLE_GET  = URL_HOST_PROTOCOL + URL_HOST_BASE + "/develmodetoggle";
+var URL_DOWNLOADLOGFILE = URL_HOST_PROTOCOL + URL_HOST_BASE + "/downloadlog";
+var URL_DOWNLOADDB      = URL_HOST_PROTOCOL + URL_HOST_BASE + "/downloaddb";
+var URL_REBOOT		= URL_HOST_PROTOCOL + URL_HOST_BASE + "/reboot";
+var URL_RESTARTAPP      = URL_HOST_PROTOCOL + URL_HOST_BASE + "/restart";
+var URL_SATELLITES_GET	= URL_HOST_PROTOCOL + URL_HOST_BASE + "/getSatellites";
+var URL_SETTINGS_GET 	= URL_HOST_PROTOCOL + URL_HOST_BASE + "/getSettings";
+var URL_SETTINGS_SET 	= URL_HOST_PROTOCOL + URL_HOST_BASE + "/setSettings";
+var URL_STATUS_GET 	= URL_HOST_PROTOCOL + URL_HOST_BASE + "/getStatus";
+var URL_SHUTDOWN	= URL_HOST_PROTOCOL + URL_HOST_BASE + "/shutdown";
+var URL_TOWERS_GET 	= URL_HOST_PROTOCOL + URL_HOST_BASE + "/getTowers";
+var URL_UPDATE_UPLOAD	= URL_HOST_PROTOCOL + URL_HOST_BASE + "/updateUpload";
 
 var URL_GPS_WS		= "ws://" + URL_HOST_BASE + "/situation";
 var URL_STATUS_WS 	= "ws://" + URL_HOST_BASE + "/status";