diff --git a/.htaccess b/.htaccess
index fbb84555..105d8c48 100755
--- a/.htaccess
+++ b/.htaccess
@@ -5,8 +5,8 @@ RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
 RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 
 #Comment out the two folling lines when running server locally to fix issues with localhost
-#RewriteCond %{HTTPS} !=on
-#RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+RewriteCond %{HTTPS} !=on
+RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 
 
 RewriteRule ^remote/(.*) php/controller.php?id=$1 [L]
diff --git a/server/server.js b/server/server.js
index 4b071678..ea6cd7f8 100755
--- a/server/server.js
+++ b/server/server.js
@@ -4,7 +4,7 @@ var server;
 This if for the localhost running
 
 ******/
-localhost = true;
+localhost = false;
 
 //https server
 if(localhost)