story#587, simplify login locations