diff --git a/Postman/Postman-Configuration/PostmanConfigurationController.php b/Postman/Postman-Configuration/PostmanConfigurationController.php
index 8ce1f682..689545d0 100644
--- a/Postman/Postman-Configuration/PostmanConfigurationController.php
+++ b/Postman/Postman-Configuration/PostmanConfigurationController.php
@@ -562,12 +562,12 @@ public function outputWizardContent() {
 		
 		print( '<div class="ps-ib ps-w-50">' );
 		printf( '<label for="postman_options[sender_name]">%s</label>', esc_html__( 'Name', 'post-smtp' ) );
-		print wp_kses( $this->settingsRegistry->sender_name_callback(), $this->allowed_tags );
+		print wp_kses( $this->settingsRegistry->sender_name_callback( false ), $this->allowed_tags );
 		print( '</div>' );
 
 		print( '<div class="ps-ib ps-w-50">' );
 		printf( '<label for="postman_options[sender_email]">%s</label>', esc_html__( 'Email Address', 'post-smtp' ) );
-		print wp_kses( $this->settingsRegistry->from_email_callback(), $this->allowed_tags );
+		print wp_kses( $this->settingsRegistry->from_email_callback( false ), $this->allowed_tags );
 		print( '</div>' );
 
 		print( '<div class="clear"></div>' );
diff --git a/Postman/Postman-Configuration/PostmanRegisterConfigurationSettings.php b/Postman/Postman-Configuration/PostmanRegisterConfigurationSettings.php
index ac363167..47f4f0b7 100644
--- a/Postman/Postman-Configuration/PostmanRegisterConfigurationSettings.php
+++ b/Postman/Postman-Configuration/PostmanRegisterConfigurationSettings.php
@@ -56,7 +56,7 @@ private function registerSettings() {
 			add_settings_field( PostmanOptions::MESSAGE_SENDER_EMAIL, __( 'Email Address', 'post-smtp' ), array(
 					$this,
 					'from_email_callback',
-			), PostmanAdminController::MESSAGE_FROM_OPTIONS, PostmanAdminController::MESSAGE_FROM_SECTION );
+			), PostmanAdminController::MESSAGE_FROM_OPTIONS, PostmanAdminController::MESSAGE_FROM_SECTION, array( true ) );
 
 			add_settings_field( PostmanOptions::PREVENT_MESSAGE_SENDER_EMAIL_OVERRIDE, '', array(
 					$this,
@@ -66,7 +66,7 @@ private function registerSettings() {
 			add_settings_field( PostmanOptions::MESSAGE_SENDER_NAME, __( 'Name', 'post-smtp' ), array(
 					$this,
 					'sender_name_callback',
-			), PostmanAdminController::MESSAGE_FROM_OPTIONS, PostmanAdminController::MESSAGE_FROM_SECTION );
+			), PostmanAdminController::MESSAGE_FROM_OPTIONS, PostmanAdminController::MESSAGE_FROM_SECTION, array( true ) );
 
 			add_settings_field( PostmanOptions::PREVENT_MESSAGE_SENDER_NAME_OVERRIDE, '', array(
 					$this,
@@ -283,8 +283,19 @@ public function smtp_mailer_callback() {
 	/**
 	 * Get the settings option array and print one of its values
 	 */
-	public function sender_name_callback() {
-		return sprintf( '<input type="text" id="input_sender_name" class="ps-input ps-w-75" name="postman_options[sender_name]" value="%s" size="40" />', null !== $this->options->getMessageSenderName() ? esc_attr( $this->options->getMessageSenderName() ) : '' );
+	public function sender_name_callback( $_echo = true ) {
+
+		if( $_echo ) {
+
+			printf( '<input type="text" id="input_sender_name" class="ps-input ps-w-75" name="postman_options[sender_name]" value="%s" size="40" />', null !== $this->options->getMessageSenderName() ? esc_attr( $this->options->getMessageSenderName() ) : '' );
+
+		}
+		else {
+
+			return sprintf( '<input type="text" id="input_sender_name" class="ps-input ps-w-75" name="postman_options[sender_name]" value="%s" size="40" />', null !== $this->options->getMessageSenderName() ? esc_attr( $this->options->getMessageSenderName() ) : '' );
+			
+		}
+
 	}
 
 	/**
@@ -297,8 +308,19 @@ public function prevent_from_name_override_callback() {
 	/**
 	 * Get the settings option array and print one of its values
 	 */
-	public function from_email_callback() {
-		return sprintf( '<input type="email" id="input_sender_email" class="ps-input ps-w-75" name="postman_options[sender_email]" value="%s" size="40" class="required" placeholder="%s"/>', null !== $this->options->getMessageSenderEmail() ? esc_attr( $this->options->getMessageSenderEmail() ) : '', __( 'Required', 'post-smtp' ) );
+	public function from_email_callback( $_echo = true ) {
+
+		if( $_echo ) {
+
+			printf( '<input type="email" id="input_sender_email" class="ps-input ps-w-75" name="postman_options[sender_email]" value="%s" size="40" class="required" placeholder="%s"/>', null !== $this->options->getMessageSenderEmail() ? esc_attr( $this->options->getMessageSenderEmail() ) : '', __( 'Required', 'post-smtp' ) );
+	
+		}
+		else {
+
+			return sprintf( '<input type="email" id="input_sender_email" class="ps-input ps-w-75" name="postman_options[sender_email]" value="%s" size="40" class="required" placeholder="%s"/>', null !== $this->options->getMessageSenderEmail() ? esc_attr( $this->options->getMessageSenderEmail() ) : '', __( 'Required', 'post-smtp' ) );
+
+		}
+
 	}
 
 	/**