diff --git a/esp_meas.pro.user b/esp_meas.pro.user
index 6c78556..f6c0c09 100644
--- a/esp_meas.pro.user
+++ b/esp_meas.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.6.1, 2016-04-01T15:01:35. -->
+<!-- Written by QtCreator 3.6.1, 2016-04-05T14:38:12. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/html/pages/wifi.tpl b/html/pages/wifi.tpl
index 5059085..b72002c 100644
--- a/html/pages/wifi.tpl
+++ b/html/pages/wifi.tpl
@@ -52,7 +52,7 @@
 
 <div class="Modal hidden" id="psk-modal">
 	<div class="Dialog">
-		<form action="/wifi/connect.cgi" method="post" id="conn-form">
+		<form action="/wifi/connect" method="post" id="conn-form">
 			<input type="hidden" id="conn-essid" name="essid"><!--
 			--><label for="psk">Password:</label><!--
 			--><input type="password" id="conn-passwd" name="passwd"><!--
diff --git a/html/wifi/connecting.html b/html/wifi/connecting.html
index 12e3a83..33f198d 100644
--- a/html/wifi/connecting.html
+++ b/html/wifi/connecting.html
@@ -1,13 +1,13 @@
 <html><head><title>Connecting...</title>
-<link rel="stylesheet" type="text/css" href="style.css">
-<script type="text/javascript" src="140medley.min.js"></script>
+<link rel="stylesheet" type="text/css" href="/wifi/style.css">
+<script type="text/javascript" src="/wifi/140medley.min.js"></script>
 <script type="text/javascript">
 
 var xhr=j();
 
 
 function getStatus() {
-	xhr.open("GET", "connstatus.cgi");
+	xhr.open("GET", "/wifi/connstatus");
 	xhr.onreadystatechange=function() {
 		if (xhr.readyState==4 && xhr.status>=200 && xhr.status<300) {
 			var data=JSON.parse(xhr.responseText);
@@ -20,7 +20,7 @@ function getStatus() {
 				$("#status").innerHTML="Trying to connect to selected access point...";
 				window.setTimeout(getStatus, 1000);
 			} else if (data.status=="fail") {
-				$("#status").innerHTML="Connection failed. Check password and selected AP.<br /><a href=\"wifi.tpl\">Go Back</a>";
+				$("#status").innerHTML="Connection failed. Check password and selected AP.<br><a href=\"/wifi\">Go Back</a>";
 			}
 		}
 	}
diff --git a/html_src/page_wifi.php b/html_src/page_wifi.php
index 1325e32..0ee36e3 100644
--- a/html_src/page_wifi.php
+++ b/html_src/page_wifi.php
@@ -29,7 +29,7 @@
 
 <div class="Modal hidden" id="psk-modal">
 	<div class="Dialog">
-		<form action="/wifi/connect.cgi" method="post" id="conn-form">
+		<form action="/wifi/connect" method="post" id="conn-form">
 			<input type="hidden" id="conn-essid" name="essid"><!--
 			--><label for="psk">Password:</label><!--
 			--><input type="password" id="conn-passwd" name="passwd"><!--
