First step on getting the authorisation stuff cleaned up. This is only for the login form, all other stuff is still where it is.