Fixes registration. Clean up UserFactory based methods