CSH-956 - Fixed the User entry removal