"wife's" visa for foreigner Work Z holder

Hello, i was traveling in China for business and tourizm with F type permit (business and visiting), now i got married with foreigner that lives in china with working status Z type. To live in China with my husband and not to be able to leave i need now to change my type from F to Z? (i am not sure wich letter should be in mine). For this i should go out China and change mine in Consular Office out of PRC. We want to visit Ho Chi Minh this hillidays, i think this should be really great if i can change status there. We have all invitation letters, documents from husbands job, certificate about marrige and so on. This is possible?