diff --git a/api/auth.go b/api/auth.go
index <HASH>..<HASH> 100644
--- a/api/auth.go
+++ b/api/auth.go
@@ -482,7 +482,7 @@ func removeUser(w http.ResponseWriter, r *http.Request, t auth.Token) error {
 	if email != "" && u.IsAdmin() {
 		u, err = auth.GetUserByEmail(email)
 		if err != nil {
-			return err
+			return &errors.HTTP{Code: http.StatusNotFound, Message: err.Error()}
 		}
 	} else if u.IsAdmin() {
 		return &errors.HTTP{Code: http.StatusBadRequest, Message: "please specify the user you want to remove"}
Changed the return code on delete a user to <I> if not found

When querying the user database, if a user is not found the api currently
returns a server error (5XX) which is inconsistent with the other api
calls. This commit updates this behaviour.