diff --git a/src/main/java/com/commafeed/backend/model/User.java b/src/main/java/com/commafeed/backend/model/User.java
index d4f6cbbb..9dd9b768 100644
--- a/src/main/java/com/commafeed/backend/model/User.java
+++ b/src/main/java/com/commafeed/backend/model/User.java
@@ -21,7 +21,8 @@ public class User extends AbstractModel {
 	@Index(name = "username_index")
 	private String name;
 
-	@Column(length = 256)
+	@Column(length = 255, unique = true)
+	@Index(name = "useremail_index")
 	private String email;
 
 	@Column(length = 256, nullable = false)