diff --git a/assets/js/src/newsletters/newsletters.jsx b/assets/js/src/newsletters/newsletters.jsx
index 3c9c048240..567f7c7cee 100644
--- a/assets/js/src/newsletters/newsletters.jsx
+++ b/assets/js/src/newsletters/newsletters.jsx
@@ -34,7 +34,7 @@ const getAutomaticEmailsRoutes = () => {
     name: automaticEmail.slug,
     component: AutomaticEmailEventsList,
     data: {
-      automaticEmail,
+      email: automaticEmail,
     },
   }));
 };
diff --git a/assets/js/src/newsletters/types.jsx b/assets/js/src/newsletters/types.jsx
index f027ad08cd..f36b022087 100644
--- a/assets/js/src/newsletters/types.jsx
+++ b/assets/js/src/newsletters/types.jsx
@@ -62,6 +62,8 @@ define(
             <div>
               <a className="button button-primary"
                 onClick={this.setupNewsletter.bind(null, automaticEmail.slug)}
+                role="button"
+                tabIndex={0}
               >
                 { MailPoet.I18n.t('setUp') }
               </a>
diff --git a/assets/js/src/newsletters/types/automatic_emails/events_list.jsx b/assets/js/src/newsletters/types/automatic_emails/events_list.jsx
index dc7946282b..d38dc3e39d 100644
--- a/assets/js/src/newsletters/types/automatic_emails/events_list.jsx
+++ b/assets/js/src/newsletters/types/automatic_emails/events_list.jsx
@@ -6,20 +6,20 @@ import _ from 'underscore';
 class AutomaticEmailEventsList extends React.Component {
   constructor(props) {
     super(props);
-    this.automaticEmail = this.props.route.data.automaticEmail;
-    this.automaticEmailEvents = this.automaticEmail.events;
+    this.email = this.props.route.data.email;
+    this.emailEvents = this.email.events;
     this.eventsConfigurator = this.eventsConfigurator.bind(this);
   }
 
   eventsConfigurator(eventSlug) {
-    this.props.router.push(`new/${this.automaticEmail.slug}/${eventSlug}/conditions`);
+    this.props.router.push(`new/${this.email.slug}/${eventSlug}/conditions`);
   }
 
   displayEvents() {
-    const events = _.map(this.automaticEmailEvents, (event, index) => {
+    const events = _.map(this.emailEvents, (event, index) => {
       let action;
 
-      if (this.automaticEmail.premium) {
+      if (this.email.premium) {
         action = (
           <a href="?page=mailpoet-premium"
             target="_blank"
@@ -75,7 +75,7 @@ class AutomaticEmailEventsList extends React.Component {
 
   render() {
     const heading = MailPoet.I18n.t('selectAutomaticEmailsEventsHeading')
-      .replace('%1s', this.automaticEmail.title);
+      .replace('%1s', this.email.title);
 
     return (
       <div>