Make creation of users more logical