Split login page into two - one for intial login attempts and one for 'relogin' attempts (where the password is prompted for again). Ensured the right form is reached in the right circumstances #51