Fix enhance privacy subuser

- Fix enhance privacy subuser
- Remove mandatory if enhance privacy subuser enabled