lots of login page cleanup