diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAddress.java b/hsarback/src/de/hsadmin/mods/email/EMailAddress.java
index 917568f..03bdeb9 100644
--- a/hsarback/src/de/hsadmin/mods/email/EMailAddress.java
+++ b/hsarback/src/de/hsadmin/mods/email/EMailAddress.java
@@ -77,7 +77,7 @@ public class EMailAddress extends AbstractEntity implements Serializable {
 		}
 		String[] doms = parts[1].split("\\.");
 		StringBuilder query = new StringBuilder("obj.localpart='" + parts[0]
-				+ "' AND ( ( obj.subdomain IS NULL AND obj.domain.name='" + parts[1]
+				+ "' AND ( ( (obj.subdomain IS NULL OR obj.subdomain='') AND obj.domain.name='" + parts[1]
 				+ "' )");
 		for (int subdomLevel = 1; subdomLevel < doms.length - 1; ++subdomLevel) {
 			String subdom = "";