diff --git a/src/conf.go b/src/conf.go
index abc754c..6a2cf91 100644
--- a/src/conf.go
+++ b/src/conf.go
@@ -54,7 +54,7 @@ func (e mainEnv) uiConfigurationDump(w http.ResponseWriter, r *http.Request, ps
 	w.Write([]byte(finalJSON))
 }
 
-func (e mainEnv) globalUserDelete(userTOKEN string) {
+func (e mainEnv) globalUserDelete(email string) {
 	// not implemented
 }
 
diff --git a/src/expiration_api.go b/src/expiration_api.go
index dbed21b..ccab2df 100644
--- a/src/expiration_api.go
+++ b/src/expiration_api.go
@@ -14,9 +14,12 @@ func (e mainEnv) expUsers() error {
 	records, err := e.db.store.GetExpiring(storage.TblName.Users, "expstatus", "wait")
 	for _, rec := range records {
 		userTOKEN := rec["token"].(string)
-		resultJSON, _ := e.db.getUserJson(userTOKEN)
+		resultJSON, userBSON, _ := e.db.getUser(userTOKEN)
 		if resultJSON != nil {
-			e.globalUserDelete(userTOKEN)
+			email := getStringValue(userBSON["email"])
+			if len(email) > 0 {
+				e.globalUserDelete(email)
+			}
 			e.db.deleteUserRecord(resultJSON, userTOKEN)
 			e.db.updateUserExpStatus(userTOKEN, "expired")
 		}
@@ -135,14 +138,17 @@ func (e mainEnv) expDeleteData(w http.ResponseWriter, r *http.Request, ps httpro
 	if enforceUUID(w, identity, event) == false {
 		return
 	}
-	resultJSON, userTOKEN, err := e.db.getUserJsonByIndex(identity, mode, e.conf)
-	if resultJSON == nil || err != nil {
+	userJSON, userTOKEN, userBSON, err := e.db.getUserByIndex(identity, mode, e.conf)
+	if userJSON == nil || err != nil {
 		returnError(w, r, "internal error", 405, nil, event)
 		return
 	}
 	event.Record = userTOKEN
-	e.globalUserDelete(userTOKEN)
-	_, err = e.db.deleteUserRecord(resultJSON, userTOKEN)
+	email := getStringValue(userBSON["email"])
+	if len(email) > 0 {
+		e.globalUserDelete(email)
+	}
+	_, err = e.db.deleteUserRecord(userJSON, userTOKEN)
 	if err != nil {
 		returnError(w, r, "internal error", 405, nil, event)
 		return
diff --git a/src/users_api.go b/src/users_api.go
index 7eb3768..3dd40a6 100644
--- a/src/users_api.go
+++ b/src/users_api.go
@@ -251,15 +251,16 @@ func (e mainEnv) userDelete(w http.ResponseWriter, r *http.Request, ps httproute
 		return
 	}
 	var err error
-	var resultJSON []byte
+	var userBSON bson.M
+	var userJSON []byte
 	userTOKEN := identity
 	if mode == "token" {
 		if enforceUUID(w, identity, event) == false {
 			return
 		}
-		resultJSON, err = e.db.getUserJson(identity)
+		userJSON, userBSON, err = e.db.getUser(identity)
 	} else {
-		resultJSON, userTOKEN, err = e.db.getUserJsonByIndex(identity, mode, e.conf)
+		userJSON, userTOKEN, userBSON, err = e.db.getUserByIndex(identity, mode, e.conf)
 		event.Record = userTOKEN
 	}
 	if err != nil {
@@ -270,7 +271,13 @@ func (e mainEnv) userDelete(w http.ResponseWriter, r *http.Request, ps httproute
 	if authResult == "" {
 		return
 	}
-	if resultJSON == nil {
+	if userJSON == nil {
+		if authResult == "root" && mode == "email" {
+			e.globalUserDelete(identity)
+			w.Header().Set("Content-Type", "application/json; charset=utf-8")
+			w.WriteHeader(200)
+			fmt.Fprintf(w, `{"status":"ok","result":"done"}`)
+		}
 		returnError(w, r, "record not found", 405, nil, event)
 		return
 	}
@@ -289,9 +296,12 @@ func (e mainEnv) userDelete(w http.ResponseWriter, r *http.Request, ps httproute
 			return
 		}
 	}
-	e.globalUserDelete(userTOKEN)
+	email := getStringValue(userBSON["email"])
+	if len(email) > 0 {
+		e.globalUserDelete(email)
+	}
 	//fmt.Printf("deleting user %s\n", userTOKEN)
-	_, err = e.db.deleteUserRecord(resultJSON, userTOKEN)
+	_, err = e.db.deleteUserRecord(userJSON, userTOKEN)
 	if err != nil {
 		returnError(w, r, "internal error", 405, err, event)
 		return
@@ -300,7 +310,7 @@ func (e mainEnv) userDelete(w http.ResponseWriter, r *http.Request, ps httproute
 	w.WriteHeader(200)
 	fmt.Fprintf(w, `{"status":"ok","result":"done"}`)
 	notifyURL := e.conf.Notification.NotificationURL
-	notifyForgetMe(notifyURL, resultJSON, "token", userTOKEN)
+	notifyForgetMe(notifyURL, userJSON, "token", userTOKEN)
 }
 
 func (e mainEnv) userPrelogin(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {