Actually for realz fixed email handling