diff --git a/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/repository/UserRepositoryImpl.java b/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/repository/UserRepositoryImpl.java
index 1b1c1e199..647eaedff 100644
--- a/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/repository/UserRepositoryImpl.java
+++ b/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/repository/UserRepositoryImpl.java
@@ -31,7 +31,7 @@ public class UserRepositoryImpl implements CineastsUserDetailsService {
     }
 
     private User findByLogin(String login) {
-        return template.lookup(User.class,"login",login).to(User.class).single();
+        return template.lookup(User.class,"login",login).to(User.class).singleOrNull();
     }
 
     @Override