Fix for missing E-Mail