CMS-4368 Login Improvements