Fix form validation messages does not use the correct variables