Issue 1331: Account creation options
Allowing for odd case, fixing home page logic
further to additional
additional to new. Stop committing until everyone is done talking
Rebase