Merge: rev761 (two forms in +login, including login and create account)