fixes CAT-970 and CAT-654
correct messages from server are shown