diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index 01b6922..19653a8 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -109,13 +109,13 @@ module.exports = function (ctx) {
       },
       env: ctx.dev
         ? { // Base URL for API-Calls: DEV
-          API: JSON.stringify('http://localhost:8080'),
-          //API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocaching'),
+          //API: JSON.stringify('http://localhost:8080'),
+          API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocaching'),
           USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
-          API: JSON.stringify('http://localhost:8080'),
-          //API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocaching'),
+          //API: JSON.stringify('http://localhost:8080'),
+          API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocaching'),
           USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement')
         }
     },
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 02c5ced..1ad4d4c 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -1,7 +1,6 @@
 package hhn.labsw.bugageocaching.controller;
 
 import com.google.gson.Gson;
-import com.mashape.unirest.http.exceptions.UnirestException;
 import hhn.labsw.bugageocaching.entities.*;
 import hhn.labsw.bugageocaching.helper.POI;
 import hhn.labsw.bugageocaching.helper.RankingListHelper;
@@ -603,14 +602,15 @@ public class Controller {
     int i = 0;
 
     // zählt teammitglieder
-    for (User_Info userInfo1 : user_infoRepository.findAll()) {
+    List<User_Info> user_infos = user_infoRepository.findByTeam(team);
+    /*for (User_Info userInfo1 : user_infoRepository.findAll()) {
       if (userInfo1.getTeam().equals(team)) {
         i++;
       }
-    }
+    }*/
 
     // wenn maximalanzahl der teammitglieder erreicht...
-    if (i >= 10) {
+    if (user_infos.size() >= 10) {
       return ResponseEntity.status(400).body("The team already has 10 members");
     }
 
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java
index 309cc41..252547e 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java
@@ -1,5 +1,6 @@
 package hhn.labsw.bugageocaching.repositories;
 
+import hhn.labsw.bugageocaching.entities.Team;
 import hhn.labsw.bugageocaching.entities.User;
 import hhn.labsw.bugageocaching.entities.User_Info;
 import org.springframework.data.jpa.repository.Query;
@@ -10,4 +11,5 @@ import java.util.Optional;
 
 public interface User_InfoRepository extends CrudRepository<User_Info, Integer> {
   User_Info findUser_InfoByUser(User user);
+  List<User_Info> findByTeam(Team team);
 }