Issue 1331: Account creation options
Allowing for odd case, fixing home page logic
further to additional
Rebase
Added tests for this branch