Fix remember token implementation