diff --git a/canapGEST/API/app/Http/Controllers/AuthController.php b/canapGEST/API/app/Http/Controllers/AuthController.php
index c6413c17c5af0a828dc5996007c1dd1d1b1a1a2d..b54913f657a3610280f3f37cbb32e298b46247f6 100644
--- a/canapGEST/API/app/Http/Controllers/AuthController.php
+++ b/canapGEST/API/app/Http/Controllers/AuthController.php
@@ -40,7 +40,8 @@ class AuthController extends Controller
 
   public function login()
   {
-    // TODO: Limit group access
+    // TODO: Limit group access to canap-gest-users
+
     $oClient = new TequilaClient("https://tequila.epfl.ch/cgi-bin/tequila/");
     $oClient->setParam(
       array(
@@ -74,7 +75,7 @@ class AuthController extends Controller
   public function tequilareturn()
   {
     // return redirect()->to("https://canap-gest-dev.local:8080/#/?key=" . $_GET["key"]);
-    return redirect()->to("https://canap-gest:8443/#/?key=" . $_GET["key"]);
+    return redirect()->to("https://canap-gest.epfl.ch/#/?key=" . $_GET["key"]);
   }
 
   public function logout()
diff --git a/canapGEST/Site/src/plugins/axios.js b/canapGEST/Site/src/plugins/axios.js
index 85451d9d39afa7af84ccbbf8e06b7236df060497..92c3b231658c657c9927f48eed666a94346c0ee7 100644
--- a/canapGEST/Site/src/plugins/axios.js
+++ b/canapGEST/Site/src/plugins/axios.js
@@ -4,7 +4,7 @@ import router from '@/router/index.js'
 
 const instance = axios.create({
   headers: { 'Authorization': "Bearer " + localStorage.getItem('stored_token') },
-  baseURL: 'https://canap-gest.epfl.ch:8443/api'
+  baseURL: 'https://canap-gest.epfl.ch/api'
 })
 
 instance.interceptors.response.use(function (response) {
diff --git a/canapGEST/Site/src/store/modules/user/actions.js b/canapGEST/Site/src/store/modules/user/actions.js
index fecd82579cade1eed1e3cd543a5ea34cf76f3b55..b44d0bdf5056ac3acbcb61f2f2efd1fc0a520734 100644
--- a/canapGEST/Site/src/store/modules/user/actions.js
+++ b/canapGEST/Site/src/store/modules/user/actions.js
@@ -8,7 +8,7 @@ export function login (context, key) {
     })
   }
   else {
-    window.location.href = "https://canap-gest.epfl.ch:8443/api/auth/login"
+    window.location.href = "https://canap-gest.epfl.ch/api/auth/login"
   }
 }