Fixing remember me logic