change user creation logic and associations