Fixes for emailaddress field renamed