Remove fourth step of login process. Fold it into 3rd step, with collapsible fieldset.

openscholar/openscholar#4289.