Fixed issues with 
- Site save error
- Assign Client Mapping error when no active cities
- New User Message Created/Saved message
- enable notification not being selected