Reverted some weird changes with search/create user