refactored new-user

This could be as simple as that unless I have misunderstood your intent.