This way we're able to put the features and the upgrade process together, but benefit from all the error handling that's already in the login & reg pages without a complete rewrite.
This is not proposed as the final solution, but a mid-way point to allow us to test.