diff --git a/src/Form/ModuleConfigurationForm.php b/src/Form/ModuleConfigurationForm.php
index a590abe7dd78cc269180f446bdfbfd6bec3032aa..ae314b4c448d71cc3a2de909cf83f5facd52605f 100644
--- a/src/Form/ModuleConfigurationForm.php
+++ b/src/Form/ModuleConfigurationForm.php
@@ -33,7 +33,6 @@ class ModuleConfigurationForm extends ConfigFormBase {
     $config = $this->config('wcm8_siteinfo.settings');
     $site_config = $this->config('system.site');
     $site_name = $site_config->get('name');
-    $site_mail = $site_config->get('mail');
     
     $form['siteinfo'] = array(
       '#type' => 'vertical_tabs',
@@ -118,11 +117,11 @@ class ModuleConfigurationForm extends ConfigFormBase {
       '#default_value' => $config->get('fax'),
     );
     
-    $form['contact']['email'] = array(
+    $form['contact']['contact_email'] = array(
       '#type' => 'email',
       '#title' => $this->t('Email'),
       '#description' => $this->t('Main contact email for your site.'),
-      '#default_value' => $site_mail,
+      '#default_value' => $config->get('contact_email'),
     );
     
     // Social Networking tab
@@ -155,7 +154,7 @@ class ModuleConfigurationForm extends ConfigFormBase {
       ->set('zip', $values['zip'])
       ->set('phone', $values['phone'])
       ->set('fax', $values['fax'])
-      ->set('email', $values['email'])
+      ->set('email', $values['contact_email'])
       ->set('twitter', $values['twitter'])
       ->save();