ECMS-6122 revert code for the case same id popup