Fixed a few bugs relating to registration. A few more scenarios are now accounted for such as a user registering again before they click the link in the confirmation email