fix user name
add org create/user create steps