Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -rf8da3934756eb50a727203ceab526ca4fc6ebb20 -rf51ccc4bb67ebb489c7d251428f3d123c0cd56e5 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision f8da3934756eb50a727203ceab526ca4fc6ebb20) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision f51ccc4bb67ebb489c7d251428f3d123c0cd56e5) @@ -356,7 +356,8 @@ } public User getUserByLogin(String login) { - return (User)baseDAO.findByProperty(User.class,"login",login).get(0); + List results = baseDAO.findByProperty(User.class,"login",login); + return results.isEmpty() ? null : (User)results.get(0); } public void updatePassword(String login, String password) {