#JC-1743: Remember me doesn't work for some people
 *Fixed code review remarks