Refactor email input groups

latest