diff --git a/assets/js/src/welcome_wizard/steps_controller.jsx b/assets/js/src/welcome_wizard/steps_controller.jsx
index cae34148bc..a8d2b1270e 100644
--- a/assets/js/src/welcome_wizard/steps_controller.jsx
+++ b/assets/js/src/welcome_wizard/steps_controller.jsx
@@ -8,7 +8,7 @@ import WelcomeWizardEmailCourseStep from './steps/email_course_step.jsx';
 import WelcomeWizardUsageTrackingStep from './steps/usage_tracking_step.jsx';
 import WelcomeWizardWooCommerceStep from './steps/woo_commerce_step.jsx';
 
-import CreateSenderSettings from './create_sender_settings.jsx'
+import CreateSenderSettings from './create_sender_settings.jsx';
 
 const WelcomeWizardStepsController = (props) => {
   const stepsCount = window.is_woocommerce_active ? 4 : 3;
@@ -69,6 +69,12 @@ const WelcomeWizardStepsController = (props) => {
       .then(() => (props.history.push('/steps/2')));
   }
 
+  function skipSenderStep() {
+    setLoading(true);
+    updateSettings(CreateSenderSettings({ address: window.admin_email, name: '' }))
+      .then(finishWizard);
+  }
+
   return (
     <div className="mailpoet_welcome_wizard_steps mailpoet_welcome_wizard_centered_column">
       <WelcomeWizardHeader
@@ -81,7 +87,7 @@ const WelcomeWizardStepsController = (props) => {
           <WelcomeWizardSenderStep
             update_sender={updateSender}
             submit_sender={submitSender}
-            finish={finishWizard}
+            finish={skipSenderStep}
             loading={loading}
             sender={sender}
           />
diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php
index 9db3311a89..d55a004184 100644
--- a/lib/Config/Menu.php
+++ b/lib/Config/Menu.php
@@ -389,9 +389,7 @@ class Menu {
       'is_woocommerce_active' => $this->woocommerce_helper->isWooCommerceActive(),
       'finish_wizard_url' => WPFunctions::get()->adminUrl('admin.php?page=' . self::MAIN_PAGE_SLUG),
       'sender' => $this->settings->get('sender'),
-      'reply_to' => $this->settings->get('reply_to'),
-      'installed_at' => $this->settings->get('installed_at'),
-      'mss_active' => Bridge::isMPSendingServiceEnabled(),
+      'admin_email' => get_option('admin_email'),
     ];
     $this->displayPage('welcome_wizard.html', $data);
   }
@@ -642,7 +640,7 @@ class Menu {
 
     $last_announcement_seen = $this->user_flags->get('last_announcement_seen');
     $data['feature_announcement_has_news'] = (
-      empty($last_announcement_seen) || 
+      empty($last_announcement_seen) ||
       $last_announcement_seen < strtotime(self::LAST_ANNOUNCEMENT_DATE)
     );
     $data['last_announcement_seen'] = $last_announcement_seen;
diff --git a/views/welcome_wizard.html b/views/welcome_wizard.html
index a7d5c9c667..57042afb17 100644
--- a/views/welcome_wizard.html
+++ b/views/welcome_wizard.html
@@ -9,6 +9,7 @@
   var is_woocommerce_active = <%= json_encode(is_woocommerce_active)  %>;
   var finish_wizard_url = '<%= finish_wizard_url %>';
   var sender_data = <%= json_encode(sender) %>;
+  var admin_email = <%= json_encode(admin_email) %>;
 </script>
 
 <div id="welcome_wizard_container"></div>