Moving some stuff around
Misc changes to registrations, disabling accounts etc