small_fixes: fixed msg when form invalid
Merge branch 'small_fixes'