diff --git a/CHANGELOG.md b/CHANGELOG.md
index acf8b04..544a0fe 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 Changelog
 =========
+1.8.7 (2022-11-12)
+- Fixed bug when field `Override "From" Details` was not updated
+
 1.8.6 (2022-11-09)
 - Version update
 
diff --git a/includes/options-page.php b/includes/options-page.php
index b6ee2fe..bdfe998 100755
--- a/includes/options-page.php
+++ b/includes/options-page.php
@@ -1,23 +1,23 @@
 <?php
 
-	/*
-	 * mailgun-wordpress-plugin - Sending mail from Wordpress using Mailgun
-	 * Copyright (C) 2016 Mailgun, et al.
-	 *
-	 * This program is free software; you can redistribute it and/or modify
-	 * it under the terms of the GNU General Public License as published by
-	 * the Free Software Foundation; either version 2 of the License, or
-	 * (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License along
-	 * with this program; if not, write to the Free Software Foundation, Inc.,
-	 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-	 */
+/*
+ * mailgun-wordpress-plugin - Sending mail from Wordpress using Mailgun
+ * Copyright (C) 2016 Mailgun, et al.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 $mailgun = Mailgun::getInstance();
 
@@ -54,403 +54,405 @@
 
 ?>
 <div class="wrap">
-	<div id="icon-options-general" class="icon32"><br/></div>
-	<span class="alignright">
+    <div id="icon-options-general" class="icon32"><br/></div>
+    <span class="alignright">
 				<a target="_blank" href="http://www.mailgun.com/">
-					<img src="<?php echo $icon?>" alt="Mailgun" style="width:50px;"/>
+					<img src="<?php echo $icon ?>" alt="Mailgun" style="width:50px;"/>
 				</a>
 			</span>
-	<h2><?php _e('Mailgun', 'mailgun'); ?></h2>
+    <h2><?php _e('Mailgun', 'mailgun'); ?></h2>
 
-	<p>
-		<?php
-			$url = 'https://www.mailgun.com';
-			$link = sprintf(
-				wp_kses(
-					__('A <a href="%1$s" target="%2$s">Mailgun</a> account is required to use this plugin and the Mailgun service.', 'mailgun'),
-					array('a' => array(
-							'href' => array(),
-							'target' => array()
-						)
-					)
-				), esc_url($url), '_blank'
-			);
-			echo $link;
-		?>
-	</p>
+    <p>
+        <?php
+        $url = 'https://www.mailgun.com';
+        $link = sprintf(
+            wp_kses(
+                __('A <a href="%1$s" target="%2$s">Mailgun</a> account is required to use this plugin and the Mailgun service.', 'mailgun'),
+                array('a' => array(
+                    'href' => array(),
+                    'target' => array()
+                )
+                )
+            ), esc_url($url), '_blank'
+        );
+        echo $link;
+        ?>
+    </p>
 
-	<p>
-		<?php
-			$url = 'https://signup.mailgun.com/new/signup';
-			$link = sprintf(
-				wp_kses(
-					__('If you need to register for an account, you can do so at <a href="%1$s" target="%2$s">Mailgun.com</a>.', 'mailgun'),
-					array('a' => array(
-							'href' => array(),
-							'target' => array()
-						)
-					)
-				), esc_url($url), '_blank'
-			);
-			echo $link;
-		?>
-	</p>
+    <p>
+        <?php
+        $url = 'https://signup.mailgun.com/new/signup';
+        $link = sprintf(
+            wp_kses(
+                __('If you need to register for an account, you can do so at <a href="%1$s" target="%2$s">Mailgun.com</a>.', 'mailgun'),
+                array('a' => array(
+                    'href' => array(),
+                    'target' => array()
+                )
+                )
+            ), esc_url($url), '_blank'
+        );
+        echo $link;
+        ?>
+    </p>
 
-	<h3><?php _e('Configuration', 'mailgun'); ?></h3>
-	<form id="mailgun-form" action="options.php" method="post">
-		<?php settings_fields('mailgun'); ?>
+    <h3><?php _e('Configuration', 'mailgun'); ?></h3>
+    <form id="mailgun-form" action="options.php" method="post">
+        <?php settings_fields('mailgun'); ?>
 
-		<table class="form-table">
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('Select Your Region', 'mailgun'); ?>
-				</th>
-				<td>
-					<?php if ($mailgun_region_const): ?>
-						<input type="hidden" name="mailgun[region]" value="<?php echo $mailgun_region ?>">
-					<?php endif ?>
+        <table class="form-table">
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Select Your Region', 'mailgun'); ?>
+                </th>
+                <td>
+                    <?php if ($mailgun_region_const): ?>
+                        <input type="hidden" name="mailgun[region]" value="<?php echo $mailgun_region ?>">
+                    <?php endif ?>
 
-					<select id="mailgun-region" name="mailgun[region]" <?php echo $mailgun_region_const ? 'disabled="disabled"' : '' ?>>
-						<option value="us"<?php selected('us', $mailgun_region); ?>><?php _e('U.S./North America', 'mailgun') ?></option>
-						<option value="eu"<?php selected('eu', $mailgun_region); ?>><?php _e('Europe', 'mailgun') ?></option>
-					</select>
-					<p class="description">
-						<?php
-							_e('Choose a region - U.S./North America or Europe - from which to send email, and to store your customer data. Please note that your sending domain must be set up in whichever region you choose.', 'mailgun');
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('Use HTTP API', 'mailgun'); ?>
-				</th>
-				<td>
-					<?php if (!is_null($mailgun_use_api_const)): ?>
-						<input type="hidden" name="mailgun[useAPI]" value="<?php echo $mailgun_use_api ?>">
-					<?php endif ?>
+                    <select id="mailgun-region"
+                            name="mailgun[region]" <?php echo $mailgun_region_const ? 'disabled="disabled"' : '' ?>>
+                        <option value="us"<?php selected('us', $mailgun_region); ?>><?php _e('U.S./North America', 'mailgun') ?></option>
+                        <option value="eu"<?php selected('eu', $mailgun_region); ?>><?php _e('Europe', 'mailgun') ?></option>
+                    </select>
+                    <p class="description">
+                        <?php
+                        _e('Choose a region - U.S./North America or Europe - from which to send email, and to store your customer data. Please note that your sending domain must be set up in whichever region you choose.', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Use HTTP API', 'mailgun'); ?>
+                </th>
+                <td>
+                    <?php if (!is_null($mailgun_use_api_const)): ?>
+                        <input type="hidden" name="mailgun[useAPI]" value="<?php echo $mailgun_use_api ?>">
+                    <?php endif ?>
 
-					<select id="mailgun-api" name="mailgun[useAPI]" <?php echo !is_null($mailgun_use_api_const) ? 'disabled="disabled"' : '' ?>>
-						<option value="1"<?php selected('1', $mailgun_use_api); ?>><?php _e('Yes', 'mailgun'); ?></option>
-						<option value="0"<?php selected('0', $mailgun_use_api); ?>><?php _e('No', 'mailgun'); ?></option>
-					</select>
-					<p class="description">
-						<?php
-							_e('Set this to "No" if your server cannot make outbound HTTP connections or if emails are not being delivered. "No" will cause this plugin to use SMTP. Default "Yes".', 'mailgun');
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('Mailgun Domain Name', 'mailgun'); ?>
-				</th>
-				<td>
-					<input type="text" class="regular-text"
-						   name="mailgun[domain]"
-						   value="<?php esc_attr_e($mailgun_domain); ?>"
-						   placeholder="samples.mailgun.org"
-						   <?php echo $mailgun_domain_const ? 'readonly="readonly"' : '' ?>
-					/>
-					<p class="description">
-						<?php _e('Your Mailgun Domain Name.', 'mailgun'); ?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top" class="mailgun-api">
-				<th scope="row">
-					<?php _e('API Key', 'mailgun'); ?>
-				</th>
-				<td>
-					<input type="text" class="regular-text" name="mailgun[apiKey]"
-						   value="<?php esc_attr_e($mailgun_api_key); ?>"
-						   placeholder="key-3ax6xnjp29jd6fds4gc373sgvjxteol0"
-						   <?php echo $mailgun_api_key_const ? 'readonly="readonly"' : '' ?>
-					/>
-					<p class="description">
-						<?php
-							_e('Your Mailgun Private API key.  For more information on where to find your Private API key, see <a target="_blank" href="https://help.mailgun.com/hc/en-us/articles/203380100-Where-Can-I-Find-My-API-Key-and-SMTP-Credentials-">here</a>', 'mailgun');
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top" class="mailgun-smtp">
-				<th scope="row">
-					<?php _e('Username', 'mailgun'); ?>
-				</th>
-				<td>
-					<input type="text" class="regular-text"
-						   name="mailgun[username]"
-						   value="<?php esc_attr_e($mailgun_username); ?>"
-						   placeholder="postmaster"
-						   <?php echo $mailgun_username_const ? 'readonly="readonly"' : '' ?>
-					/>
-					<p class="description">
-						<?php
-							_e('Your Mailgun SMTP username. Only valid for use with SMTP.', 'mailgun');
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top" class="mailgun-smtp">
-				<th scope="row">
-					<?php _e('Password', 'mailgun'); ?>
-				</th>
-				<td>
-					<input type="text" class="regular-text"
-						   name="mailgun[password]"
-						   value="<?php esc_attr_e($mailgun_password); ?>"
-						   placeholder="my-password"
-						   <?php echo $mailgun_password_const ? 'readonly="readonly"' : '' ?>
-					/>
-					<p class="description">
-						<?php
-							_e('Your Mailgun SMTP password that goes with the above username. Only valid for use with SMTP.', 'mailgun');
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top" class="mailgun-smtp">
-				<th scope="row">
-					<?php _e('Use Secure SMTP', 'mailgun'); ?>
-				</th>
-				<td>
-					<?php if (!is_null($mailgun_secure_const)): ?>
-						<input type="hidden" name="mailgun[secure]" value="<?php echo $mailgun_secure ?>">
-					<?php endif ?>
+                    <select id="mailgun-api"
+                            name="mailgun[useAPI]" <?php echo !is_null($mailgun_use_api_const) ? 'disabled="disabled"' : '' ?>>
+                        <option value="1"<?php selected('1', $mailgun_use_api); ?>><?php _e('Yes', 'mailgun'); ?></option>
+                        <option value="0"<?php selected('0', $mailgun_use_api); ?>><?php _e('No', 'mailgun'); ?></option>
+                    </select>
+                    <p class="description">
+                        <?php
+                        _e('Set this to "No" if your server cannot make outbound HTTP connections or if emails are not being delivered. "No" will cause this plugin to use SMTP. Default "Yes".', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Mailgun Domain Name', 'mailgun'); ?>
+                </th>
+                <td>
+                    <input type="text" class="regular-text"
+                           name="mailgun[domain]"
+                           value="<?php esc_attr_e($mailgun_domain); ?>"
+                           placeholder="samples.mailgun.org"
+                        <?php echo $mailgun_domain_const ? 'readonly="readonly"' : '' ?>
+                    />
+                    <p class="description">
+                        <?php _e('Your Mailgun Domain Name.', 'mailgun'); ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top" class="mailgun-api">
+                <th scope="row">
+                    <?php _e('API Key', 'mailgun'); ?>
+                </th>
+                <td>
+                    <input type="text" class="regular-text" name="mailgun[apiKey]"
+                           value="<?php esc_attr_e($mailgun_api_key); ?>"
+                           placeholder="key-3ax6xnjp29jd6fds4gc373sgvjxteol0"
+                        <?php echo $mailgun_api_key_const ? 'readonly="readonly"' : '' ?>
+                    />
+                    <p class="description">
+                        <?php
+                        _e('Your Mailgun Private API key.  For more information on where to find your Private API key, see <a target="_blank" href="https://help.mailgun.com/hc/en-us/articles/203380100-Where-Can-I-Find-My-API-Key-and-SMTP-Credentials-">here</a>', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top" class="mailgun-smtp">
+                <th scope="row">
+                    <?php _e('Username', 'mailgun'); ?>
+                </th>
+                <td>
+                    <input type="text" class="regular-text"
+                           name="mailgun[username]"
+                           value="<?php esc_attr_e($mailgun_username); ?>"
+                           placeholder="postmaster"
+                        <?php echo $mailgun_username_const ? 'readonly="readonly"' : '' ?>
+                    />
+                    <p class="description">
+                        <?php
+                        _e('Your Mailgun SMTP username. Only valid for use with SMTP.', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top" class="mailgun-smtp">
+                <th scope="row">
+                    <?php _e('Password', 'mailgun'); ?>
+                </th>
+                <td>
+                    <input type="text" class="regular-text"
+                           name="mailgun[password]"
+                           value="<?php esc_attr_e($mailgun_password); ?>"
+                           placeholder="my-password"
+                        <?php echo $mailgun_password_const ? 'readonly="readonly"' : '' ?>
+                    />
+                    <p class="description">
+                        <?php
+                        _e('Your Mailgun SMTP password that goes with the above username. Only valid for use with SMTP.', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top" class="mailgun-smtp">
+                <th scope="row">
+                    <?php _e('Use Secure SMTP', 'mailgun'); ?>
+                </th>
+                <td>
+                    <?php if (!is_null($mailgun_secure_const)): ?>
+                        <input type="hidden" name="mailgun[secure]" value="<?php echo $mailgun_secure ?>">
+                    <?php endif ?>
 
-					<select name="mailgun[secure]" <?php echo !is_null($mailgun_secure_const) ? 'disabled="disabled"' : '' ?>>
-						<option value="1"<?php selected('1', $mailgun_secure); ?>><?php _e('Yes', 'mailgun'); ?></option>
-						<option value="0"<?php selected('0', $mailgun_secure); ?>><?php _e('No', 'mailgun'); ?></option>
-					</select>
-					<p class="description">
-						<?php
-							_e('Set this to "No" if your server cannot establish SSL SMTP connections or if emails are not being delivered. If you set this to "No" your password will be sent in plain text. Only valid for use with SMTP. Default "Yes".', 'mailgun');
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top" class="mailgun-smtp">
-				<th scope="row">
-					<?php _e('Security Type', 'mailgun'); ?>
-				</th>
-				<td>
-					<?php if ($mailgun_sectype_const): ?>
-						<input type="hidden" name="mailgun[sectype]" value="<?php echo $mailgun_sectype ?>">
-					<?php endif ?>
+                    <select name="mailgun[secure]" <?php echo !is_null($mailgun_secure_const) ? 'disabled="disabled"' : '' ?>>
+                        <option value="1"<?php selected('1', $mailgun_secure); ?>><?php _e('Yes', 'mailgun'); ?></option>
+                        <option value="0"<?php selected('0', $mailgun_secure); ?>><?php _e('No', 'mailgun'); ?></option>
+                    </select>
+                    <p class="description">
+                        <?php
+                        _e('Set this to "No" if your server cannot establish SSL SMTP connections or if emails are not being delivered. If you set this to "No" your password will be sent in plain text. Only valid for use with SMTP. Default "Yes".', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top" class="mailgun-smtp">
+                <th scope="row">
+                    <?php _e('Security Type', 'mailgun'); ?>
+                </th>
+                <td>
+                    <?php if ($mailgun_sectype_const): ?>
+                        <input type="hidden" name="mailgun[sectype]" value="<?php echo $mailgun_sectype ?>">
+                    <?php endif ?>
 
-					<select name="mailgun[sectype]" <?php echo $mailgun_sectype_const ? 'disabled="disabled"' : '' ?>>
-						<option value="ssl"<?php selected('ssl', $mailgun_sectype); ?>>SSL</option>
-						<option value="tls"<?php selected('tls', $mailgun_sectype); ?>>TLS</option>
-					</select>
-					<p class="description">
-						<?php
-							_e('Leave this at "TLS" unless mail sending fails. This option only matters for Secure SMTP. Default "TLS".', 'mailgun');
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('Click Tracking', 'mailgun'); ?>
-				</th>
-				<td>
-					<select name="mailgun[track-clicks]">
-						<option value="htmlonly"<?php selected('htmlonly', $this->get_option('track-clicks')); ?>><?php _e('HTML Only', 'mailgun'); ?></option>
-						<option value="yes"<?php selected('yes', $this->get_option('track-clicks')); ?>><?php _e('Yes', 'mailgun'); ?></option>
-						<option value="no"<?php selected('no', $this->get_option('track-clicks')); ?>><?php _e('No', 'mailgun'); ?></option>
-					</select>
-					<p class="description">
-						<?php
-							$url = 'https://documentation.mailgun.com/en/latest/user_manual.html#tracking-clicks';
-							$link = sprintf(
-								wp_kses(
-									__('If enabled, Mailgun will track links. <a href="%1$s" target="%2$s">Open Tracking Documentation</a>.', 'mailgun'),
-									array('a' => array(
-										'href' => array(),
-										'target' => array()
-										)
-									)
-								), esc_url($url), '_blank'
-							);
-							echo $link;
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('Open Tracking', 'mailgun'); ?>
-				</th>
-				<td>
-					<select name="mailgun[track-opens]">
-						<option value="1"<?php selected('1', $this->get_option('track-opens')); ?>><?php _e('Yes', 'mailgun'); ?></option>
-						<option value="0"<?php selected('0', $this->get_option('track-opens')); ?>><?php _e('No', 'mailgun'); ?></option>
-					</select>
-					<p class="description">
-						<?php
-							$url = 'https://documentation.mailgun.com/en/latest/user_manual.html#tracking-opens';
-							$link = sprintf(
-								wp_kses(
-									__('If enabled, HTML messages will include an open tracking beacon. <a href="%1$s" target="%2$s">Open Tracking Documentation</a>.', 'mailgun'),
-									array('a' => array(
-										'href' => array(),
-										'target' => array()
-										)
-									)
-								), esc_url($url), '_blank'
-							);
-							echo $link;
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('From Address', 'mailgun'); ?>
-				</th>
-				<td>
-					<input type="text"
-						   class="regular-text"
-						   name="mailgun[from-address]"
-						   value="<?php esc_attr_e($mailgun_from_address); ?>"
-						   placeholder="wordpress@mydomain.com"
-						   <?php echo $mailgun_from_address_const ? 'readonly="readonly"' : '' ?>
-					/>
-					<p class="description">
-						<?php
-							_e('The &lt;address@mydomain.com&gt; part of the sender information (<code>"Excited User &lt;user@samples.mailgun.org&gt;"</code>). This address will appear as the `From` address on sent mail. <strong>It is recommended that the @mydomain portion matches your Mailgun sending domain.</strong>', 'mailgun');
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('From Name', 'mailgun'); ?>
-				</th>
-				<td>
-					<input type="text" class="regular-text"
-						   name="mailgun[from-name]"
-						   value="<?php esc_attr_e($mailgun_from_name); ?>"
-						   placeholder="WordPress"
-						   <?php echo $mailgun_from_name_const ? 'readonly="readonly"' : '' ?>
-					/>
-					<p class="description">
-						<?php
-							_e('The "User Name" part of the sender information (<code>"Excited User &lt;user@samples.mailgun.org&gt;"</code>).', 'mailgun');
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('Override "From" Details', 'mailgun'); ?>
-				</th>
-				<td>
-					<select name="mailgun[override-from]">
-						<option value="1"<?php selected('1', $this->get_option('override-from', null, '0')); ?>><?php _e('Yes', 'mailgun'); ?></option>
-						<option value="0"<?php selected('0', $this->get_option('override-from', null, '0')); ?>><?php _e('No', 'mailgun'); ?></option>
-					</select>
-					<p class="description">
-						<?php
-							_e('If enabled, all emails will be sent with the above "From Name" and "From Address", regardless of values set by other plugins. Useful for cases where other plugins don\'t play nice with our "From Name" / "From Address" setting.', 'mailgun');
-						?>
-					</p>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('Tag', 'mailgun'); ?>
-				</th>
-				<td>
-					<input type="text" class="regular-text"
-						   name="mailgun[campaign-id]"
-						   value="<?php esc_attr_e($this->get_option('campaign-id')); ?>"
-						   placeholder="tag"
-					/>
-					<p class="description">
-						<?php
-							_e('If added, this tag will exist on every outbound message. Statistics will be populated in the Mailgun Control Panel. Use a comma to define multiple tags. ', 'mailgun');
-							_e('Learn more about', 'mailgun');
+                    <select name="mailgun[sectype]" <?php echo $mailgun_sectype_const ? 'disabled="disabled"' : '' ?>>
+                        <option value="ssl"<?php selected('ssl', $mailgun_sectype); ?>>SSL</option>
+                        <option value="tls"<?php selected('tls', $mailgun_sectype); ?>>TLS</option>
+                    </select>
+                    <p class="description">
+                        <?php
+                        _e('Leave this at "TLS" unless mail sending fails. This option only matters for Secure SMTP. Default "TLS".', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Click Tracking', 'mailgun'); ?>
+                </th>
+                <td>
+                    <select name="mailgun[track-clicks]">
+                        <option value="htmlonly"<?php selected('htmlonly', $this->get_option('track-clicks')); ?>><?php _e('HTML Only', 'mailgun'); ?></option>
+                        <option value="yes"<?php selected('yes', $this->get_option('track-clicks')); ?>><?php _e('Yes', 'mailgun'); ?></option>
+                        <option value="no"<?php selected('no', $this->get_option('track-clicks')); ?>><?php _e('No', 'mailgun'); ?></option>
+                    </select>
+                    <p class="description">
+                        <?php
+                        $url = 'https://documentation.mailgun.com/en/latest/user_manual.html#tracking-clicks';
+                        $link = sprintf(
+                            wp_kses(
+                                __('If enabled, Mailgun will track links. <a href="%1$s" target="%2$s">Open Tracking Documentation</a>.', 'mailgun'),
+                                array('a' => array(
+                                    'href' => array(),
+                                    'target' => array()
+                                )
+                                )
+                            ), esc_url($url), '_blank'
+                        );
+                        echo $link;
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Open Tracking', 'mailgun'); ?>
+                </th>
+                <td>
+                    <select name="mailgun[track-opens]">
+                        <option value="1"<?php selected('1', $this->get_option('track-opens')); ?>><?php _e('Yes', 'mailgun'); ?></option>
+                        <option value="0"<?php selected('0', $this->get_option('track-opens')); ?>><?php _e('No', 'mailgun'); ?></option>
+                    </select>
+                    <p class="description">
+                        <?php
+                        $url = 'https://documentation.mailgun.com/en/latest/user_manual.html#tracking-opens';
+                        $link = sprintf(
+                            wp_kses(
+                                __('If enabled, HTML messages will include an open tracking beacon. <a href="%1$s" target="%2$s">Open Tracking Documentation</a>.', 'mailgun'),
+                                array('a' => array(
+                                    'href' => array(),
+                                    'target' => array()
+                                )
+                                )
+                            ), esc_url($url), '_blank'
+                        );
+                        echo $link;
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('From Address', 'mailgun'); ?>
+                </th>
+                <td>
+                    <input type="text"
+                           class="regular-text"
+                           name="mailgun[from-address]"
+                           value="<?php esc_attr_e($mailgun_from_address); ?>"
+                           placeholder="wordpress@mydomain.com"
+                        <?php echo $mailgun_from_address_const ? 'readonly="readonly"' : '' ?>
+                    />
+                    <p class="description">
+                        <?php
+                        _e('The &lt;address@mydomain.com&gt; part of the sender information (<code>"Excited User &lt;user@samples.mailgun.org&gt;"</code>). This address will appear as the `From` address on sent mail. <strong>It is recommended that the @mydomain portion matches your Mailgun sending domain.</strong>', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('From Name', 'mailgun'); ?>
+                </th>
+                <td>
+                    <input type="text" class="regular-text"
+                           name="mailgun[from-name]"
+                           value="<?php esc_attr_e($mailgun_from_name); ?>"
+                           placeholder="WordPress"
+                        <?php echo $mailgun_from_name_const ? 'readonly="readonly"' : '' ?>
+                    />
+                    <p class="description">
+                        <?php
+                        _e('The "User Name" part of the sender information (<code>"Excited User &lt;user@samples.mailgun.org&gt;"</code>).', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Override "From" Details', 'mailgun'); ?>
+                </th>
+                <td>
+                    <select name="mailgun[override-from]">
+                        <option value="1"<?php selected('1', (int)$this->get_option('override-from')); ?>><?php _e('Yes', 'mailgun'); ?></option>
+                        <option value="0"<?php selected('0', (int)$this->get_option('override-from')); ?>><?php _e('No', 'mailgun'); ?></option>
+                    </select>
+                    <p class="description">
+                        <?php
+                        _e('If enabled, all emails will be sent with the above "From Name" and "From Address", regardless of values set by other plugins. Useful for cases where other plugins don\'t play nice with our "From Name" / "From Address" setting.', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Tag', 'mailgun'); ?>
+                </th>
+                <td>
+                    <input type="text" class="regular-text"
+                           name="mailgun[campaign-id]"
+                           value="<?php esc_attr_e($this->get_option('campaign-id')); ?>"
+                           placeholder="tag"
+                    />
+                    <p class="description">
+                        <?php
+                        _e('If added, this tag will exist on every outbound message. Statistics will be populated in the Mailgun Control Panel. Use a comma to define multiple tags. ', 'mailgun');
+                        _e('Learn more about', 'mailgun');
 
-							$url1 = 'https://documentation.mailgun.com/en/latest/user_manual.html#tracking-messages';
-							$url2 = 'https://documentation.mailgun.com/en/latest/user_manual.html#tagging';
-							$link = sprintf(
-								wp_kses(
-									__('<a href="%1$s" target="%3$s">Tracking</a> and <a href="%2$s" target="%3$s">Tagging</a>', 'mailgun'),
-									array('a' => array(
-										'href' => array(),
-										'target' => array()
-										)
-									)
-								), esc_url($url1), esc_url($url2), '_blank'
-							);
-							echo $link;
-						?>
-					</p>
-				</td>
-			</tr>
-		</table>
-		<h3><?php _e('Lists', 'mailgun'); ?></h3>
-		<table class="form-table">
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('Shortcode', 'mailgun'); ?>
-				</th>
-				<td>
-					<div>
-						<code>[mailgun id="<em>{mailgun list id}</em>" collect_name="true"]</code>
-					</div>
-					<div>
-						<p class="description">
-							<?php
-								_e('Use the shortcode above to associate a widget instance with a mailgun list', 'mailgun');
-							?>
-						</p>
-					</div>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row">
-					<?php _e('Lists', 'mailgun'); ?>
-				</th>
-				<td>
-					<?php
-						$url = '?page=mailgun-lists';
+                        $url1 = 'https://documentation.mailgun.com/en/latest/user_manual.html#tracking-messages';
+                        $url2 = 'https://documentation.mailgun.com/en/latest/user_manual.html#tagging';
+                        $link = sprintf(
+                            wp_kses(
+                                __('<a href="%1$s" target="%3$s">Tracking</a> and <a href="%2$s" target="%3$s">Tagging</a>', 'mailgun'),
+                                array('a' => array(
+                                    'href' => array(),
+                                    'target' => array()
+                                )
+                                )
+                            ), esc_url($url1), esc_url($url2), '_blank'
+                        );
+                        echo $link;
+                        ?>
+                    </p>
+                </td>
+            </tr>
+        </table>
+        <h3><?php _e('Lists', 'mailgun'); ?></h3>
+        <table class="form-table">
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Shortcode', 'mailgun'); ?>
+                </th>
+                <td>
+                    <div>
+                        <code>[mailgun id="<em>{mailgun list id}</em>" collect_name="true"]</code>
+                    </div>
+                    <div>
+                        <p class="description">
+                            <?php
+                            _e('Use the shortcode above to associate a widget instance with a mailgun list', 'mailgun');
+                            ?>
+                        </p>
+                    </div>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Lists', 'mailgun'); ?>
+                </th>
+                <td>
+                    <?php
+                    $url = '?page=mailgun-lists';
 
-						$link = sprintf(
-							wp_kses(
-								__('<a href="%1$s" target="%2$s">View available lists</a>.', 'mailgun'),
-								array('a' => array(
-									'href' => array(),
-									)
-								)
-							), esc_url($url)
-						);
-						echo $link;
-					?>
-				</td>
-			</tr>
-		</table>
-		<p>
-			<?php
-				_e('Before attempting to test the configuration, please click "Save Changes".', 'mailgun');
-			?>
-		</p>
-		<p class="submit">
-			<input type="submit"
-				   class="button-primary"
-				   value="<?php _e('Save Changes', 'mailgun'); ?>"
-			/>
-			<input type="button"
-				   id="mailgun-test"
-				   class="button-secondary"
-				   value="<?php _e('Test Configuration', 'mailgun'); ?>"
-			/>
-		</p>
+                    $link = sprintf(
+                        wp_kses(
+                            __('<a href="%1$s" target="%2$s">View available lists</a>.', 'mailgun'),
+                            array('a' => array(
+                                'href' => array(),
+                            )
+                            )
+                        ), esc_url($url)
+                    );
+                    echo $link;
+                    ?>
+                </td>
+            </tr>
+        </table>
+        <p>
+            <?php
+            _e('Before attempting to test the configuration, please click "Save Changes".', 'mailgun');
+            ?>
+        </p>
+        <p class="submit">
+            <input type="submit"
+                   class="button-primary"
+                   value="<?php _e('Save Changes', 'mailgun'); ?>"
+            />
+            <input type="button"
+                   id="mailgun-test"
+                   class="button-secondary"
+                   value="<?php _e('Test Configuration', 'mailgun'); ?>"
+            />
+        </p>
 
-		<p>
-			<?php _e("The configuration test email will be sent to your site's administrative email address:", 'mailgun'); ?> <?php echo esc_html(get_option('admin_email'));?>
-		</p>
-	</form>
+        <p>
+            <?php _e("The configuration test email will be sent to your site's administrative email address:", 'mailgun'); ?><?php echo esc_html(get_option('admin_email')); ?>
+        </p>
+    </form>
 </div>
diff --git a/mailgun.php b/mailgun.php
index 2112300..4cda4c2 100755
--- a/mailgun.php
+++ b/mailgun.php
@@ -3,7 +3,7 @@
  * Plugin Name:  Mailgun
  * Plugin URI:   http://wordpress.org/extend/plugins/mailgun/
  * Description:  Mailgun integration for WordPress
- * Version:      1.8.5
+ * Version:      1.8.7
  * Tested up to: 6.1
  * Author:       Mailgun
  * Author URI:   http://www.mailgun.com/
diff --git a/readme.md b/readme.md
index f1b1cc5..8d64a0b 100755
--- a/readme.md
+++ b/readme.md
@@ -5,7 +5,7 @@ Contributors: mailgun, sivel, lookahead.io, m35dev
 Tags: mailgun, smtp, http, api, mail, email
 Requires at least: 3.3
 Tested up to: 6.1
-Stable tag: 1.8.5
+Stable tag: 1.8.7
 Requires PHP: 5.6
 License: GPLv2 or later
 
@@ -130,6 +130,9 @@ MAILGUN_FROM_ADDRESS Type: string
 
 
 == Changelog ==
+= 1.8.7 (2022-11-12): =
+- Fixed bug when field `Override "From" Details` was not updated
+
 = 1.8.3 (2022-08-30): =
 - Plugin refactoring. Widget fixes for working with Legacy Widget Block. PHP8.0 support check
 
diff --git a/readme.txt b/readme.txt
index e303bea..6d4629b 100755
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Contributors: mailgun, sivel, lookahead.io, m35dev
 Tags: mailgun, smtp, http, api, mail, email
 Requires at least: 4.4
 Tested up to: 6.1
-Stable tag: v1.8.6
+Stable tag: 1.8.7
 Requires PHP: 5.6
 License: GPLv2 or later
 
@@ -128,6 +128,9 @@ MAILGUN_FROM_ADDRESS Type: string
 
 
 == Changelog ==
+= 1.8.7 (2022-11-12): =
+- Fixed bug when field `Override "From" Details` was not updated
+
 = 1.8.3 (2022-08-30): =
 - Plugin refactoring. Widget fixes for working with Legacy Widget Block. PHP8.0 support check