vendor side and account fix