logic slight changed for client and DMGT Group