Hotfix/add error messages to edit forms