ECMS-5822: Fix the problem relate to the uid