Adding and fixing emails works