Added Remember me logic