Modified create user and create tenant