core-4569 fix form messages