From b8cd0b024cbea26a1bb3ca42d4ab399acd8052e9 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 11 Aug 2014 06:01:49 +0200
Subject: [PATCH] allow admin user removal

---
 src/main/java/com/commafeed/frontend/resource/AdminREST.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/resource/AdminREST.java b/src/main/java/com/commafeed/frontend/resource/AdminREST.java
index d6c087ac..2df3c29d 100644
--- a/src/main/java/com/commafeed/frontend/resource/AdminREST.java
+++ b/src/main/java/com/commafeed/frontend/resource/AdminREST.java
@@ -168,8 +168,8 @@ public class AdminREST {
 		if (u == null) {
 			return Response.status(Status.NOT_FOUND).build();
 		}
-		if (CommaFeedApplication.USERNAME_ADMIN.equals(u.getName())) {
-			return Response.status(Status.FORBIDDEN).entity("You cannot delete the admin user.").build();
+		if (user.getId().equals(u.getId())) {
+			return Response.status(Status.FORBIDDEN).entity("You cannot delete your own user.").build();
 		}
 		userService.unregister(u);
 		return Response.ok().build();