Added small fix for remember-me feature