diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php
index 80d4fa9198..f52779aa5a 100644
--- a/lib/Config/Menu.php
+++ b/lib/Config/Menu.php
@@ -611,7 +611,6 @@ class Menu {
     });
     $data['segments'] = $segments;
     $data['settings'] = $this->settings->getAll();
-    $data['user_flags'] = $this->user_flags->getAll();
     $data['current_wp_user'] = WPFunctions::get()->wpGetCurrentUser()->to_array();
     $data['current_wp_user_firstname'] = WPFunctions::get()->wpGetCurrentUser()->user_firstname;
     $data['site_url'] = WPFunctions::get()->siteUrl();
@@ -637,9 +636,13 @@ class Menu {
     $data['is_woocommerce_active'] = $this->woocommerce_helper->isWooCommerceActive();
 
     $user_id = $data['current_wp_user']['ID'];
-    $data['feature_announcement_has_news'] = empty($data['user_flags']['last_announcement_seen'])
-      || $data['user_flags']['last_announcement_seen'] < strtotime(self::LAST_ANNOUNCEMENT_DATE);
-    $data['last_announcement_seen'] = $data['user_flags']['last_announcement_seen'];
+
+    $last_announcement_seen = $this->user_flags->get('last_announcement_seen');
+    $data['feature_announcement_has_news'] = (
+      empty($last_announcement_seen) || 
+      $last_announcement_seen < strtotime(self::LAST_ANNOUNCEMENT_DATE)
+    );
+    $data['last_announcement_seen'] = $last_announcement_seen;
 
     $data['automatic_emails'] = array(
       array(
@@ -707,7 +710,7 @@ class Menu {
     $data = array(
       'shortcodes' => ShortcodesHelper::getShortcodes(),
       'settings' => $this->settings->getAll(),
-      'user_flags' => $this->user_flags->getAll(),
+      'editor_tutorial_seen' => $this->user_flags->get('editor_tutorial_seen'),
       'current_wp_user' => array_merge($subscriber_data, WPFunctions::get()->wpGetCurrentUser()->to_array()),
       'sub_menu' => self::MAIN_PAGE_SLUG,
       'mss_active' => Bridge::isMPSendingServiceEnabled()
diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html
index bac550040c..dc7a8a1b34 100644
--- a/views/newsletter/editor.html
+++ b/views/newsletter/editor.html
@@ -1412,7 +1412,7 @@
       },
       dragDemoUrl: '<%= cdn_url('newsletter-editor/editor-drag-demo.20190226-1505.mp4') %>',
       currentUserId: '<%= current_wp_user.wp_user_id %>',
-      dragDemoUrlSettings: '<%= user_flags["editor_tutorial_seen"] %>',
+      dragDemoUrlSettings: '<%= editor_tutorial_seen %>',
       installedAt: '<%= settings["installed_at"] %>',
       mtaMethod: '<%= settings["mta"]["method"] %>',
       displayWcProductsWidget: '<%= settings["display_wc_products_widget"] %>',