bugfixes, save email when changed