resolve user creation bug
merge