CMS-4367 Login Form Improvements