Fix some user status bugs
Merge branch 'master' into temp/disabled_registration