Fixing emails addresses