more rework on wish list, capture last login