diff --git a/src/highlanderticketing/main.go b/src/highlanderticketing/main.go
index dca41105cda021688378fa4a25ef3a32624a4b00..12b4c02e6ff3bf3d9596be11c91e8b0fc8536037 100644
--- a/src/highlanderticketing/main.go
+++ b/src/highlanderticketing/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"net/http"
 	"os"
 
@@ -8,9 +9,15 @@ import (
 	log "github.com/sirupsen/logrus"
 	"gitlab.reutlingen-university.de/ege/highlander-ticketing-go-ss2023/src/highlanderticketing/db"
 	"gitlab.reutlingen-university.de/ege/highlander-ticketing-go-ss2023/src/highlanderticketing/handler"
+	"gitlab.reutlingen-university.de/ege/highlander-ticketing-go-ss2023/src/highlanderticketing/model"
+	"gitlab.reutlingen-university.de/ege/highlander-ticketing-go-ss2023/src/highlanderticketing/service"
 )
 
 func main() {
+	service.DeleteAllUsers()
+	var userArray []model.User
+	userArray, _ = service.GetAllUsers()
+	fmt.Println(userArray)
 	//service.DeleteAllMatches()
 	//api.GetMatchesOfApiToDb("https://api.openligadb.de/getmatchesbyteamid/16/5/0")
 	//init db
diff --git a/src/highlanderticketing/service/register.go b/src/highlanderticketing/service/register.go
index 73ffdda20d796e3d9690884c58872f0f8660830d..42eff89571d90a685407ec8a1afa81dd6266d740 100644
--- a/src/highlanderticketing/service/register.go
+++ b/src/highlanderticketing/service/register.go
@@ -1,23 +1,13 @@
 package service
 
-import (
-	"fmt"
-)
-
 func Register(accessToken string) error {
-
 	user, err := GetUserInfo(accessToken)
 	if err != nil {
 		return err
 	}
-	fmt.Println(user)
 	err1 := CreateUser(&user)
 	if err1 != nil {
 		return err1
 	}
-	/*var userArray []model.User
-	userArray, _ = GetAllUsers()
-
-	fmt.Println(userArray)*/
 	return nil
 }
diff --git a/src/highlanderticketing/service/user.go b/src/highlanderticketing/service/user.go
index 2a1b5cd4582bb3a4eec597daad7ba1e7056be224..c9af7c2b042cae94eccad1b1ab64dd6d8d8d5cdb 100644
--- a/src/highlanderticketing/service/user.go
+++ b/src/highlanderticketing/service/user.go
@@ -18,12 +18,11 @@ func CreateUser(user *model.User) error {
 	if isFirstCall == false {
 		user.IsAdmin = false
 	} else if isFirstCall == true {
-		users, err := GetAllUsers()
-		if err != nil {
-			return err
-		}
-		if len(users) == 0 {
+		_, err := GetAllUsers()
+		if err == mongo.ErrNoDocuments {
 			user.IsAdmin = true
+		} else if err != nil {
+			return err
 		} else {
 			user.IsAdmin = false
 		}
@@ -35,8 +34,7 @@ func CreateUser(user *model.User) error {
 		return err
 	}
 
-	filter := bson.D{primitive.E{Key: "email", Value: user.Email}}
-
+	filter := bson.M{"email": user.Email}
 	update := bson.M{
 		"$setOnInsert": bson.M{
 			"_id":         user.ID,