Issue #2551453 by LoMo, Ayesh, jaxxed, LinL, madhavvyas, Miraya: Follow-up: Consistently use "email" instead of "e-mail" in Drupal