diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index c3a8c30..d1aadbd 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -109,7 +109,8 @@ module.exports = function (ctx) {
       },
       env: ctx.dev
         ? { // Base URL for API-Calls: DEV
-          API: JSON.stringify('http://localhost:8080')
+          //API: JSON.stringify('http://localhost:8080')
+          API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
           //API: JSON.stringify('http://seserver.se.hs-heilbronn.de:9080/buga19geocaching')
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 9ec6a11..72158f5 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -96,7 +96,7 @@
 
         console.log("GET /api/login/ - json: " + JSON.stringify(data));
 
-        this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/login', data)
+        this.$axios.post('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement/account/login', data)
           .then((response) => {
             console.log("GET/POST /api/login/ - response: ");
             console.log(response.data);
diff --git a/frontend/src/pages/MyCaches.vue b/frontend/src/pages/MyCaches.vue
index 9f39752..3a81425 100644
--- a/frontend/src/pages/MyCaches.vue
+++ b/frontend/src/pages/MyCaches.vue
@@ -270,10 +270,16 @@
         })
       },
       continueCache(cacheID) {
-      },
-      validateEmail(email) {
-        let re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-        return re.test(String(email).toLowerCase());
+        let currentCache;
+        let params;
+
+        this.$axios.get('/api/currentStation', {params})
+          .then((response) => {
+          })
+          .catch((error) => {
+        });
+
+        this.$router.push({path: `/station/${cacheID}`})
       },
       getPersonalRanking() {
         const name = JSON.parse(localStorage.getItem('userToken')).name;
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 0d718af..6bdf3ef 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -53,7 +53,7 @@ public class Controller {
     fetchPublicKey();
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/allCaches")
   @ResponseBody
   public ResponseEntity getAllCaches() {
@@ -61,7 +61,7 @@ public class Controller {
   }
 
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/startCache")
   @ResponseBody
   public ResponseEntity startCache(@RequestParam(value = "token", defaultValue = "-1") String token,
@@ -143,7 +143,7 @@ public class Controller {
     }
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/checkStation")
   @ResponseBody
   public ResponseEntity checkStation(@RequestParam String token,
@@ -291,14 +291,14 @@ public class Controller {
 
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/createCache")
   @ResponseBody
   public ResponseEntity createCache(@RequestBody Cache cache) {
     return createCacheUtil(cache);
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/checkAdmin")
   @ResponseBody
   public ResponseEntity checkAdmin(@RequestParam String token) {
@@ -329,14 +329,14 @@ public class Controller {
     return ResponseEntity.status(401).body(false);
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getAllStations")
   @ResponseBody
   public ResponseEntity getAllStations() {
     return ResponseEntity.status(200).body(new Gson().toJson(stationRepository.findAll()));
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/deleteCache")
   @ResponseBody
   public ResponseEntity deleteCache(@RequestParam String cacheID) {
@@ -344,7 +344,7 @@ public class Controller {
   }
 
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getMyCaches")
   @ResponseBody
   public ResponseEntity getMyCaches(@RequestParam String token) {
@@ -380,7 +380,7 @@ public class Controller {
     }
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getRankingList")
   @ResponseBody
   public ResponseEntity getRankingList() {
@@ -395,7 +395,7 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(sendBackUsers));
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getTeamRankingList")
   @ResponseBody
   public ResponseEntity getTeamRankingList() {
@@ -410,7 +410,7 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(sendBackTeams));
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getUser")
   @ResponseBody
   public ResponseEntity getUser(@RequestParam String token) {
@@ -438,7 +438,7 @@ public class Controller {
     }
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/createTeam")
   @ResponseBody
   public ResponseEntity createTeam(@RequestParam String token,
@@ -485,7 +485,7 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(team));
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/joinTeam")
   @ResponseBody
   public ResponseEntity joinTeam(@RequestParam String token,
@@ -546,7 +546,7 @@ public class Controller {
     return ResponseEntity.status(200).body(team);
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/leaveTeam")
   @ResponseBody
   public ResponseEntity leaveTeam(@RequestParam String token) {