CW-743 - fix for alerts + configuration form
Fix merging conflicts
CW-743 - fix captcha show always