diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index 520f1d8..bc8ef88 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -247,6 +247,9 @@ public class Gruppen2Controller {
         User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
         controllerService.passIfLastAdmin(account, groupId);
         controllerService.deleteUser(user.getId(), groupId);
+        if(userService.getGroupById(groupId).getMembers().size() == 0){
+            controllerService.deleteGroupEvent(user.getId(), groupId);
+        }
         return "redirect:/gruppen2/";
     }
 
@@ -255,7 +258,7 @@ public class Gruppen2Controller {
     public String pDeleteGroup(KeycloakAuthenticationToken token, @RequestParam("group_id") Long groupId){
         Account account = keyCloakService.createAccountFromPrincipal(token);
         User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
-        controllerService.deleteGroupEvent(user, groupId);
+        controllerService.deleteGroupEvent(user.getId(), groupId);
         return "redirect:/gruppen2/";
     }
 
@@ -295,9 +298,12 @@ public class Gruppen2Controller {
 
     @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
     @PostMapping("/details/members/deleteUser")
-    public String deleteUser(KeycloakAuthenticationToken token, @RequestParam("group_id") Long groupId,
+    public String deleteUser(@RequestParam("group_id") Long groupId,
                              @RequestParam("user_id") String userId) throws EventException {
         controllerService.deleteUser(userId, groupId);
+        if(userService.getGroupById(groupId).getMembers().size() == 0){
+            controllerService.deleteGroupEvent(userId ,groupId);
+        }
         return "redirect:/gruppen2/details/members/" + groupId;
     }
 }
diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java
index 4d651d4..0d831ea 100644
--- a/src/main/java/mops/gruppen2/service/ControllerService.java
+++ b/src/main/java/mops/gruppen2/service/ControllerService.java
@@ -159,8 +159,8 @@ public class ControllerService {
         eventService.saveEvent(deleteUserEvent);
     }
 
-    public void deleteGroupEvent(User user, Long groupId) {
-        DeleteGroupEvent deleteGroupEvent = new DeleteGroupEvent(groupId, user.getId());
+    public void deleteGroupEvent(String user_id, Long groupId) {
+        DeleteGroupEvent deleteGroupEvent = new DeleteGroupEvent(groupId, user_id);
         eventService.saveEvent(deleteGroupEvent);
     }
 
diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html
index 386374c..a58cc85 100644
--- a/src/main/resources/templates/editMembers.html
+++ b/src/main/resources/templates/editMembers.html
@@ -99,7 +99,7 @@
                                                type="hidden">
                                         <input th:name="user_id" th:value="${member.getId()}"
                                                type="hidden">
-                                        <button class="btn btn-danger btn-sm" style="margin: 5px">Mitglied entfernen</button>
+                                        <button class="btn btn-danger btn-sm" style="margin: 5px" th:if='!${account.getName().equals(member.getId())}'>Mitglied entfernen</button>
                                     </form>
                                 </div>
                             </td>