anchor.diff:          ,{[<<"password">>], UserPassword}
           ,{[<<"priv_level">>], <<"admin">>}
           ]),
  -    Ctx1 = cb_context:set_account_id(Context, AccountId),
  +    Ctx0 = cb_context:set_account_id(cb_context:new(), AccountId),
  +    Ctx1 = cb_context:set_account_db(Ctx0, kz_util:format_account_db(AccountId)),
       Ctx2 = cb_context:set_doc(Ctx1, kz_json:set_values(Props, ?MK_USER)),
       Ctx3 = cb_context:set_req_data(Ctx2, kz_json:set_values(Props, ?MK_USER)),
  -    cb_users_v2:create_user(cb_context:set_accepting_charges(Ctx3)).
  +    cb_users_v2:create_user(cb_context:set_resp_status(cb_context:set_accepting_charges(Ctx3),'success')).
   
   -spec create_default_callflow(cb_context:context()) -> cb_context:context().
   create_default_callflow(Context) ->
  
positive.code:     Ctx3 = cb_accounts:put(Ctx2),
      case cb_context:resp_status(Ctx3) of
          'success' ->
              lager:info("account created"),
              kz_util:spawn(fun create_user/1, [Ctx3]),
              kz_util:spawn(fun create_default_callflow/1, [Ctx3]),
              kz_util:spawn(fun collect_onbill_data/1, [Ctx3]),
              Ctx3;
  
negative.code:             Ctx3
      end.
  
  -spec create_user(kz_json:object(), kz_term:ne_binary()) -> cb_context:context().
  create_user(JObj, AccountId) ->
      timer:sleep(7000),
      lager:debug("we are about to create user for: ~p",[AccountId]),
      Email = kz_term:to_lower_binary(
         kz_json:get_first_defined([[<<"contact">>,<<"signup">>,<<"email">>]
                                    ,<<"email">>
                                    ]
                                    ,JObj
                                   )
      ),
      Firstname =
         kz_json:get_first_defined([[<<"contact">>,<<"signup">>,<<"first_name">>]
                                    ,<<"first_name">>
                                    ]
                                    ,JObj
      ),
      Surname =
         kz_json:get_first_defined([[<<"contact">>,<<"signup">>,<<"last_name">>]
                                    ,<<"last_name">>
                                    ]
                                    ,JObj
      ),
      Phonenumber =
         kz_json:get_first_defined([[<<"contact">>,<<"signup">>,<<"number">>],<<"number">>], JObj),
      UserPassword = kz_binary:rand_hex(10),
      Props = props:filter_empty([
          {[<<"username">>], Email}
  