remove a small amount of logic from the UserAbstractFactory. Handled by ...

...shard 5.0