CMGDB account fix (from Sezen)