Fix issue with wrong id's being sent client side.
- When client generates an id change the code path
since the assumption is that the client added the message
to some ui with a correlation id.