Github username fix
stella/email cleanup