Refactored creating of user
Revert "Refactored creating of user"

This reverts commit 5d1c72376ffd5b7206d80857cb733e56bafcc65a.