diff --git a/config/install/yamlform.settings.yml b/config/install/yamlform.settings.yml
index f8b7ac2..0f6373e 100644
--- a/config/install/yamlform.settings.yml
+++ b/config/install/yamlform.settings.yml
@@ -61,6 +61,7 @@ mail:
     <p>Submitted by: [yamlform-submission:user]</p>
     <p>Submitted values are:</p>
     [yamlform-submission:values]
+  email_address_format: long
 test:
   types: |
     checkbox:
diff --git a/config/schema/yamlform.schema.yml b/config/schema/yamlform.schema.yml
index b451347..3756adc 100644
--- a/config/schema/yamlform.schema.yml
+++ b/config/schema/yamlform.schema.yml
@@ -94,6 +94,9 @@ yamlform.settings:
         default_body_html:
           type: text
           label: 'Default email body (HTML)'
+        email_address_format:
+          type: string
+          label: 'Email address format'
     export:
       type: mapping
       label: 'Export default settings'
diff --git a/src/Form/YamlFormAdminSettingsForm.php b/src/Form/YamlFormAdminSettingsForm.php
index f9c0787..b764743 100755
--- a/src/Form/YamlFormAdminSettingsForm.php
+++ b/src/Form/YamlFormAdminSettingsForm.php
@@ -381,6 +381,16 @@ class YamlFormAdminSettingsForm extends ConfigFormBase {
       '#required' => TRUE,
       '#default_value' => $config->get('mail.default_body_html'),
     ];
+    $form['mail']['email_address_format'] = [
+      '#type' => 'radios',
+      '#title' => t('Email address format'),
+      '#description' => t('Most servers support the "long" format which will allow for more friendly From addresses in emails sent. However many Windows-based servers are unable to send in the long format. Change this option if experiencing problems sending e-mails with YAML forms.'),
+      '#options' => [
+        'long' => $this->t('Long format: "Example Name" &lt;name@example.com&gt;'),
+        'short' => $this->t('Short format: name@example.com'),
+      ],
+      '#default_value' => $config->get('mail.email_address_format'),
+    ];
     $form['mail']['token_tree_link'] = [
       '#theme' => 'token_tree_link',
       '#token_types' => [
diff --git a/src/Plugin/YamlFormHandler/EmailYamlFormHandler.php b/src/Plugin/YamlFormHandler/EmailYamlFormHandler.php
index fac5e47..0b6a048 100644
--- a/src/Plugin/YamlFormHandler/EmailYamlFormHandler.php
+++ b/src/Plugin/YamlFormHandler/EmailYamlFormHandler.php
@@ -85,8 +85,12 @@ class EmailYamlFormHandler extends YamlFormHandlerBase implements YamlFormHandle
    * {@inheritdoc}
    */
   public function getSummary() {
+    $settings = $this->getEmailConfiguration();
+    if (!$this->isEmailLongFormatEnabled()) {
+      $settings['from_name'] = '';
+    }
     return [
-      '#settings' => $this->getEmailConfiguration(),
+      '#settings' => $settings,
     ] + parent::getSummary();
   }
 
@@ -177,6 +181,7 @@ class EmailYamlFormHandler extends YamlFormHandlerBase implements YamlFormHandle
         'required' => TRUE,
         'label' => $this->t('Email from name'),
         'default' => $yamlform_settings->get('mail.default_from_name') ?: $site_settings->get('name'),
+        'access' => $this->isEmailLongFormatEnabled(),
       ],
       'subject' => [
         'type' => 'textfield',
@@ -238,6 +243,7 @@ class EmailYamlFormHandler extends YamlFormHandlerBase implements YamlFormHandle
 
     foreach ($settings as $config_name => $config_settings) {
       $type = $config_settings['type'];
+      $access = isset($config_settings['access']) ? $config_settings['access'] : TRUE;
       $mode = isset($config_settings['mode']) ? $config_settings['mode'] : NULL;
       $label = $config_settings['label'];
       $group = $config_settings['group'];
@@ -283,6 +289,7 @@ class EmailYamlFormHandler extends YamlFormHandlerBase implements YamlFormHandle
         '#options' => $options,
         '#required' => $required,
         '#default_value' => $value,
+        '#access' => $access,
       ];
       $form[$group][$config_name . '_custom'] = [
         '#type' => $type,
@@ -291,6 +298,7 @@ class EmailYamlFormHandler extends YamlFormHandlerBase implements YamlFormHandle
         '#title_display' => 'hidden',
         '#default_value' => $custom_value,
         '#attributes' => ['placeholder' => $custom_label],
+        '#access' => $access,
         '#states' => [
           'visible' => [
             ':input[name="settings[' . $group . '][' . $config_name . ']"]' => ['value' => 'custom'],
@@ -496,32 +504,38 @@ class EmailYamlFormHandler extends YamlFormHandlerBase implements YamlFormHandle
    * {@inheritdoc}
    */
   public function sendMessage(array $message) {
+    $yamlform_settings = $this->configFactory->get('yamlform.settings');
+
     // Send mail.
     $to = $message['to_mail'];
-    $from = $message['from_mail'] . ' <' . $message['from_name'] . '>';
+    if ($yamlform_settings->get('mail.email_address_format') == 'short') {
+      $from = $message['from_mail'];
+    }
+    else {
+      $from = $message['from_mail'] . ' <' . $message['from_name'] . '>';
+    }
+
     $current_langcode = \Drupal::languageManager()->getCurrentLanguage()->getId();
     $this->mailManager->mail('yamlform', 'email.' . $this->getHandlerId(), $to, $current_langcode, $message, $from);
 
     // Log message.
     $variables = [
-      '@from_name' => $message['from_name'],
-      '@from_mail' => $message['from_mail'],
-      '@to_mail' => $message['to_mail'],
+      '@from' => $from,
+      '@to' => $to,
       '@subject' => $message['subject'],
     ];
-    \Drupal::logger('yamlform.email')->notice('@subject sent to @to_mail from @from_name [@from_mail].', $variables);
+    \Drupal::logger('yamlform.email')->notice('@subject sent to @to from @from.', $variables);
 
     // Debug by displaying send email onscreen.
     if ($this->configuration['debug']) {
       $t_args = [
-        '%from_name' => $message['from_name'],
-        '%from_mail' => $message['from_mail'],
-        '%to_mail' => $message['to_mail'],
+        '%from' => $from,
+        '%to' => $to,
         '%subject' => $message['subject'],
       ];
       $build = [];
       $build['message'] = [
-        '#markup' => $this->t('%subject sent to %to_mail from %from_name [%from_mail].', $t_args),
+        '#markup' => $this->t('%subject sent to %to from %from.', $t_args),
         '#prefix' => '<b>',
         '#suffix' => '</b>',
       ];
@@ -565,6 +579,7 @@ class EmailYamlFormHandler extends YamlFormHandlerBase implements YamlFormHandle
       '#title' => $this->t('From name'),
       '#required' => TRUE,
       '#default_value' => $message['from_name'],
+      '#access' => $this->isEmailLongFormatEnabled(),
     ];
     $element['subject'] = [
       '#type' => 'textfield',
@@ -613,9 +628,12 @@ class EmailYamlFormHandler extends YamlFormHandlerBase implements YamlFormHandle
   /**
    * {@inheritdoc}
    */
-  public function getMessageSummary(array $message) {
+  public function getMessageSummary(array $settings) {
+    if (!$this->isEmailLongFormatEnabled()) {
+      $settings['from_name'] = '';
+    }
     return [
-      '#settings' => $message,
+      '#settings' => $settings,
     ] + parent::getSummary();
   }
 
@@ -658,6 +676,17 @@ class EmailYamlFormHandler extends YamlFormHandlerBase implements YamlFormHandle
   }
 
   /**
+   * Determine if email long format "Example Name <name@example.com>" is enabled.
+   *
+   * @return bool
+   *   TRUE if email long format is enabled.
+   */
+  protected function isEmailLongFormatEnabled() {
+    $yamlform_settings = $this->configFactory->get('yamlform.settings');
+    return ($yamlform_settings->get('mail.email_address_format') == 'short') ? FALSE : TRUE;
+  }
+
+  /**
    * Get message body default values, which can be formatted as text or html.
    *
    * @param string $format
diff --git a/src/YamlFormHandlerMessageInterface.php b/src/YamlFormHandlerMessageInterface.php
index 5b85325..27348c0 100644
--- a/src/YamlFormHandlerMessageInterface.php
+++ b/src/YamlFormHandlerMessageInterface.php
@@ -47,12 +47,12 @@ interface YamlFormHandlerMessageInterface extends YamlFormHandlerInterface {
   /**
    * Build message summary.
    *
-   * @param array $message
+   * @param array $settings
    *   An array of message parameters.
    *
    * @return array
    *   A renderable array representing a message summary.
    */
-  public function getMessageSummary(array $message);
+  public function getMessageSummary(array $settings);
 
 }
diff --git a/templates/yamlform-handler-email-summary.html.twig b/templates/yamlform-handler-email-summary.html.twig
index 01b9660..8aeb826 100644
--- a/templates/yamlform-handler-email-summary.html.twig
+++ b/templates/yamlform-handler-email-summary.html.twig
@@ -19,6 +19,6 @@
 <b>{{ 'To:'|t }}</b> {{ settings.to_mail }}<br/>
 {% if settings.cc_mail %}<b>{{ 'Cc:'|t }}</b> {{ settings.cc_mail }}<br/>{% endif %}
 {% if settings.bcc_mail %}<b>{{ 'Bcc:'|t }}</b> {{ settings.bcc_mail }}<br/>{% endif %}
-<b>{{ 'From:'|t }}</b> {{ settings.from_mail }} &lt;{{ settings.from_name }}&gt;<br/>
+<b>{{ 'From:'|t }}</b> {{ settings.from_mail }} {% if settings.from_name %}&lt;{{ settings.from_name }}&gt;{% endif %}<br/>
 <b>{{ 'Subject:'|t }}</b> {{ settings.subject }}<br/>
 <b>{{ 'Settings:'|t }}</b> {{ settings.html ? 'HTML' : 'Plain text'|t }}{{ settings.html and settings.attachments ? '/' : '' }}{{ settings.attachments ? 'Attachments '|t : '' }}
diff --git a/yamlform.install b/yamlform.install
index dff0bb4..52ef3ee 100644
--- a/yamlform.install
+++ b/yamlform.install
@@ -711,7 +711,6 @@ function yamlform_update_8025(&$sandbox) {
   }
 }
 
-
 /**
  * Issue #2767637: Allow table columns to be customized.
  */
@@ -721,7 +720,7 @@ function yamlform_update_8026(&$sandbox) {
 }
 
 /**
- *  Issue #2767891: Allow dialogs to be disabled.
+ * Issue #2767891: Allow dialogs to be disabled.
  */
 function yamlform_update_8027(&$sandbox) {
   // Update 'yamlform.settings' configuration.
@@ -729,3 +728,13 @@ function yamlform_update_8027(&$sandbox) {
   $settings_config->set('ui.dialog_disabled', FALSE);
   $settings_config->save();
 }
+
+/**
+ * Issue #2770071: Compatibility with SMTP authentication
+ */
+function yamlform_update_8028(&$sandbox) {
+  // Update 'yamlform.settings' configuration.
+  $settings_config = \Drupal::configFactory()->getEditable('yamlform.settings');
+  $settings_config->set('mail.email_address_format', 'long');
+  $settings_config->save();
+}