Fix how users are created