diff --git a/api/src/main/java/be/naaturel/boardmateapi/common/models/Client.java b/api/src/main/java/be/naaturel/boardmateapi/common/models/Client.java
index ab8fdb95..ca0c2c44 100644
--- a/api/src/main/java/be/naaturel/boardmateapi/common/models/Client.java
+++ b/api/src/main/java/be/naaturel/boardmateapi/common/models/Client.java
@@ -3,13 +3,13 @@ package be.naaturel.boardmateapi.common.models;
 public class Client {
 
     private String id;
-    private String name;
+    private String companyName;
     private String username;
     private String key;
 
-    public Client(String id, String name, String username, String key){
+    public Client(String id, String companyName, String username, String key){
         this.id = id;
-        this.name = name;
+        this.companyName = companyName;
         this.username = username;
         this.key = key;
     }
@@ -22,8 +22,12 @@ public class Client {
         this.id = id;
     }
 
-    public String getName() {
-        return name;
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public String setCompanyName(String companyName) {
+        return this.companyName = companyName;
     }
 
     public void setUsername(String username) {
diff --git a/api/src/main/java/be/naaturel/boardmateapi/controllers/AuthController.java b/api/src/main/java/be/naaturel/boardmateapi/controllers/AuthController.java
index 2b58bab9..c3811c69 100644
--- a/api/src/main/java/be/naaturel/boardmateapi/controllers/AuthController.java
+++ b/api/src/main/java/be/naaturel/boardmateapi/controllers/AuthController.java
@@ -42,7 +42,7 @@ public class AuthController {
 
             JwtClaimsSet claims = JwtClaimsSet.builder()
                     .subject(user.getId())
-                    .claim("name", user.getName())
+                    .claim("name", user.getCompanyName())
                     .claim("username", user.getUsername())
                     .issuedAt(now)
                     .expiresAt(now.plusSeconds(3600*12))
@@ -57,7 +57,7 @@ public class AuthController {
             String token = jwtEncoder.encode(params).getTokenValue();
 
             AuthResponseDto response = new AuthResponseDto();
-            response.setName(user.getName());
+            response.setName(user.getCompanyName());
             response.setUsername(user.getUsername());
             response.setClientId(user.getId());
             response.setAuthToken(token);
diff --git a/api/src/main/java/be/naaturel/boardmateapi/repository/dtos/ClientDto.java b/api/src/main/java/be/naaturel/boardmateapi/repository/dtos/ClientDto.java
index aa289db1..1e791c1e 100644
--- a/api/src/main/java/be/naaturel/boardmateapi/repository/dtos/ClientDto.java
+++ b/api/src/main/java/be/naaturel/boardmateapi/repository/dtos/ClientDto.java
@@ -1,6 +1,7 @@
 package be.naaturel.boardmateapi.repository.dtos;
 
 import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
@@ -16,6 +17,7 @@ public class ClientDto {
     private String clientId;
 
     @Field("serviceUsername")
+    @Indexed(unique = true)
     private String serviceUsername;
 
     @Field("serviceKey")
diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties
index 8391d89c..4dbef726 100644
--- a/api/src/main/resources/application.properties
+++ b/api/src/main/resources/application.properties
@@ -39,4 +39,5 @@ springdoc.api-docs.path=/v1/docs
 
 #=============DATABASE=============
 spring.mongodb.uri=${MONGODB_URI}
-spring.mongodb.database=${DATABASE_NAME}
\ No newline at end of file
+spring.mongodb.database=${DATABASE_NAME}
+spring.data.mongodb.auto-index-creation=true
\ No newline at end of file