diff --git a/YACOSCore/ejbModule/org/yacos/core/users/UserManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/users/UserManagerBean.java
index f3fb90d..98bb5c8 100644
--- a/YACOSCore/ejbModule/org/yacos/core/users/UserManagerBean.java
+++ b/YACOSCore/ejbModule/org/yacos/core/users/UserManagerBean.java
@@ -11,6 +11,7 @@ import javax.ejb.TransactionManagement;
 import javax.ejb.TransactionManagementType;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
+import javax.persistence.NonUniqueResultException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.transaction.UserTransaction;
@@ -115,12 +116,14 @@ public class UserManagerBean implements IUserManager{
 	}
 
 	public User getByEmail(String email){
+		Query query = em.createQuery("from User where email=?");
+		query.setParameter(1, email);
 		try {
-			Query query = em.createQuery("from User where email=?");
-			query.setParameter(1, email);
 			return (User) query.getSingleResult();
 		} catch (NoResultException e) {
 			return null;
+		} catch (NonUniqueResultException e){
+			return (User) query.getResultList().get(0);
 		}
 	}