diff --git a/src/main/app/templates/welcome.html b/src/main/app/templates/welcome.html
index c06575b0..72ad9c44 100644
--- a/src/main/app/templates/welcome.html
+++ b/src/main/app/templates/welcome.html
@@ -22,7 +22,7 @@
 				<div class="feedback alert alert-danger" ng-if="message">{{message}}</div>
 				<form ng-submit="login()">
 					<div class="form-group">
-						<label for="username">User Name</label>
+						<label for="username">User Name or E-mail</label>
 						<input type="text" name="username" class="form-control" ng-model="model.name"></input>
 					</div>
 					<div class="form-group">
diff --git a/src/main/java/com/commafeed/backend/service/UserService.java b/src/main/java/com/commafeed/backend/service/UserService.java
index 49a38e0f..dbef971c 100644
--- a/src/main/java/com/commafeed/backend/service/UserService.java
+++ b/src/main/java/com/commafeed/backend/service/UserService.java
@@ -31,12 +31,15 @@ public class UserService {
 	private final PasswordEncryptionService encryptionService;
 	private final CommaFeedConfiguration config;
 
-	public Optional<User> login(String name, String password) {
-		if (name == null || password == null) {
+	public Optional<User> login(String nameOrEmail, String password) {
+		if (nameOrEmail == null || password == null) {
 			return Optional.absent();
 		}
 
-		User user = userDAO.findByName(name);
+		User user = userDAO.findByName(nameOrEmail);
+		if (user == null) {
+			user = userDAO.findByEmail(nameOrEmail);
+		}
 		if (user != null && !user.isDisabled()) {
 			boolean authenticated = encryptionService.authenticate(password, user.getPassword(), user.getSalt());
 			if (authenticated) {