diff --git a/frontend/src/components/LoginPage.vue b/frontend/src/components/LoginPage.vue
index 73815fed63280d197aa655028195a7b78cefe757..df28bce692f247cb17dcda4f6dbefea8a6ff6626 100644
--- a/frontend/src/components/LoginPage.vue
+++ b/frontend/src/components/LoginPage.vue
@@ -12,8 +12,7 @@ export default {
       user: {
         userId: '',
         userName: '',
-        password: '',
-        todoList: []
+        password: ''
       },
       repeatedPassword: ''
     }
@@ -63,7 +62,12 @@ export default {
         })
       });
 
-      const responseData = await response.json();
+      let responseData = null
+
+      //muss hier rein, bei status 401 wird nämlich kein json zurückgesendet und response.json() ist sonst nicht möglich
+      if(response.status === 200) {
+        responseData = await response.json();
+      }
 
       if(response.status === 200){
         localStorage.setItem('userId', responseData.userId)
@@ -122,10 +126,10 @@ export default {
       user {{ this.user.userName }} already exists
     </b-toast>
     <b-toast signin-success auto-hide-delay="5000" variant="success" id="signin-success" title="success">
-      Signin Success
+      sign-in was successful
     </b-toast>
     <b-toast invalid-user-password auto-hide-delay="10000" variant="danger" id="invalid-user-password" title="error">
-      User {{ this.user.userName }} or Password invalid
+      username or password invalid
     </b-toast>
   </b-container>
 </template>
diff --git a/frontend/src/components/MainPage.vue b/frontend/src/components/MainPage.vue
index 1a89d0f13020ac3cc1d71783c264444e6a56d5e9..6344b73911b4a10aa329a7d27fc923ec2adf6d12 100644
--- a/frontend/src/components/MainPage.vue
+++ b/frontend/src/components/MainPage.vue
@@ -22,7 +22,6 @@ export default {
         password: ''
       },
       todo: {
-        todoId: '',
         title: '',
         description: '',
         userId: '',
diff --git a/src/main/java/com/cloudcomputing/todo/dto/TodoDTO.java b/src/main/java/com/cloudcomputing/todo/dto/TodoDTO.java
index c4a35ad10a39eb3f9008b51359bcbf4d139f0391..aa5034a0edc08670ef45dd13bb61c275e44f42b2 100644
--- a/src/main/java/com/cloudcomputing/todo/dto/TodoDTO.java
+++ b/src/main/java/com/cloudcomputing/todo/dto/TodoDTO.java
@@ -2,13 +2,10 @@ package com.cloudcomputing.todo.dto;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.data.annotation.Id;
 
 @Getter
 @Setter
 public class TodoDTO {
-    @Id
-    private String todoId;
     private String title;
     private String description;
     private String userId;
diff --git a/src/main/java/com/cloudcomputing/todo/dto/UserDTO.java b/src/main/java/com/cloudcomputing/todo/dto/UserDTO.java
index cd5b20200f00beb221da805518e413f34a81cf97..0472e4d0e5f9dfc4dc67c517ed52c42698e5a5f8 100644
--- a/src/main/java/com/cloudcomputing/todo/dto/UserDTO.java
+++ b/src/main/java/com/cloudcomputing/todo/dto/UserDTO.java
@@ -3,13 +3,10 @@ package com.cloudcomputing.todo.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 @Getter
 @Setter
 public class UserDTO {
     private String userId;
     private String userName;
     private String password;
-    private List<TodoDTO> todos;
 }
diff --git a/src/main/java/com/cloudcomputing/todo/entity/Todo.java b/src/main/java/com/cloudcomputing/todo/entity/Todo.java
index a3f1be4f8e7b2c6ef3cbdc74d187cd8486dd1d48..aecff56ba7f372a40dbcf739f757261d37c6ad84 100644
--- a/src/main/java/com/cloudcomputing/todo/entity/Todo.java
+++ b/src/main/java/com/cloudcomputing/todo/entity/Todo.java
@@ -8,7 +8,6 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @Setter
 @Document
 public class Todo {
-    private String todoId;
     private String title;
     private String description;
     private String userId;
diff --git a/src/main/java/com/cloudcomputing/todo/entity/User.java b/src/main/java/com/cloudcomputing/todo/entity/User.java
index eefffa56528b50fcac56d9c50c156e445bf6a1e6..66026ddc6eb7ce27e0d5c91e0c8d58786d26b2ab 100644
--- a/src/main/java/com/cloudcomputing/todo/entity/User.java
+++ b/src/main/java/com/cloudcomputing/todo/entity/User.java
@@ -5,9 +5,6 @@ import lombok.Setter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Getter
 @Setter
 @Document(collection = "users")
@@ -16,5 +13,4 @@ public class User {
     private String userId;
     private String userName;
     private String passwordHash;
-    List<Todo> todoList = new ArrayList<Todo>();
 }
diff --git a/src/main/java/com/cloudcomputing/todo/mapper/TodoMapper.java b/src/main/java/com/cloudcomputing/todo/mapper/TodoMapper.java
index fce4d0c2727640500038c073527772ab90f905b7..ee4659e4cade26bf6a3c3853d716a02abe5299f2 100644
--- a/src/main/java/com/cloudcomputing/todo/mapper/TodoMapper.java
+++ b/src/main/java/com/cloudcomputing/todo/mapper/TodoMapper.java
@@ -11,8 +11,8 @@ public class TodoMapper {
         TodoDTO todoDTO = new TodoDTO();
         todoDTO.setTitle(todo.getDescription());
         todoDTO.setDescription(todo.getDescription());
-        todoDTO.setCompleted(todo.isCompleted());
         todoDTO.setUserId(todo.getUserId());
+        todoDTO.setCompleted(todo.isCompleted());
 
         return todoDTO;
     }
@@ -21,9 +21,8 @@ public class TodoMapper {
         Todo todo = new Todo();
         todo.setTitle(dto.getTitle());
         todo.setDescription(dto.getDescription());
-        todo.setCompleted(dto.isCompleted());
-        System.out.println(dto.getUserId());
         todo.setUserId(dto.getUserId());
+        todo.setCompleted(dto.isCompleted());
 
         return todo;
     }