LPS-43937 Change the original message to improve UX