Merge branch 'BF-3725' of /home/git/repositories/brainfood/ofbiz-directcontrolservlet

@@ -189,21 +189,23 @@ public class DirectControlServlet extends HttpServlet {
                     )
                     )
                 );
                 );
 
 
-                if (authTokenEntity != null && 
-                    authTokenEntity.get("userLoginId") != null) {
-                    GenericValue userLogin = EntityUtil.getFirst(
-                        delegator.findList("UserLogin",
-                            EntityCondition.makeCondition("userLoginId", 
-                            EntityOperator.EQUALS, 
-                            authTokenEntity.get("userLoginId")), 
-                            null, null, null, true));
-                    if (userLogin != null) {
-                        context.put("userLogin", userLogin);
-                    }
+                if (authTokenEntity != null) {
+                    String userLoginId = authTokenEntity.getString("userLoginId");
+                    if (UtilValidate.isNotEmpty(userLoginId)) {
+                        GenericValue userLogin = EntityUtil.getFirst(
+                                delegator.findList("UserLogin",
+                                        EntityCondition.makeCondition("userLoginId", 
+                                                EntityOperator.EQUALS, 
+                                                userLoginId.toLowerCase()), 
+                                                null, null, null, true));
+                        if (userLogin != null) {
+                            context.put("userLogin", userLogin);
+                        }
 
 
-                    // prolong the session
-                    if (UtilValidate.isNotEmpty(checkSessionService)) {
-                        dispatcher.runSync(checkSessionService, UtilMisc.<String, Object>toMap("authSessionId", authToken, "userLogin", userLogin));
+                        // prolong the session
+                        if (UtilValidate.isNotEmpty(checkSessionService)) {
+                            dispatcher.runSync(checkSessionService, UtilMisc.<String, Object>toMap("authSessionId", authToken, "userLogin", userLogin));
+                        }
                     }
                     }
                 }
                 }
             }
             }