Fix user update bugs

- Decouple addCoreSystemMessages and getCoreSystemMessages