--HR-334 Entitlements are not saved properly