Fixes related with setting email account