Revert "Just go ahead and create the user"

This reverts commit f211bf308ceee8d5acdb6c3834260a7274f95300.
Revert "Revert "Just go ahead and create the user""

This reverts commit 0501cef7ab5224768604c7b32939214d750fdce3.