Update forms
Improve email field