Updated to have user registration to fully work