diff --git a/source/services/member.ts b/source/services/member.ts
index fc85a4e..59ead28 100644
--- a/source/services/member.ts
+++ b/source/services/member.ts
@@ -513,13 +513,19 @@ namespace _espe.service.member
 				(await _espe.repository.member.dump())
 				.filter(
 					member_entry => (
+						member_entry.object.registered
+						&&
+						member_entry.object.enabled
+						&&
 						(
-							(! (member_entry.object.email_address_private === null))
-							&&
-							(member_entry.object.email_address_private === identifier)
+							(
+								(! (member_entry.object.email_address_private === null))
+								&&
+								(member_entry.object.email_address_private === identifier)
+							)
+							||
+							(name_login(member_entry.object) === identifier)
 						)
-						||
-						(name_login(member_entry.object) === identifier)
 					)
 				)
 				.map(