CON-1446-user-login-menu | minor cleanup