diff --git a/src/program/models.py b/src/program/models.py
index d64892e3..33f98139 100644
--- a/src/program/models.py
+++ b/src/program/models.py
@@ -247,7 +247,7 @@ class EventProposal(UserSubmittedModel):
         # loop through the speakerproposals linked to this eventproposal and associate any related speaker objects with this event
         for sp in self.speakers.all():
             if sp.speaker:
-                event.speaker_set.add(sp.speaker)
+                event.speakers.add(sp.speaker)
 
         self.proposal_status = eventproposalmodel.PROPOSAL_APPROVED
         self.save()
@@ -376,8 +376,8 @@ class Event(CampRelatedModel):
 
     @property
     def speakers_list(self):
-        if self.speaker_set.exists():
-            return ", ".join(self.speaker_set.all().values_list('name', flat=True))
+        if self.speakers.exists():
+            return ", ".join(self.speakers.all().values_list('name', flat=True))
         return False
 
     def get_absolute_url(self):
@@ -463,9 +463,13 @@ class EventInstance(CampRelatedModel):
             'to': self.when.lower.isoformat(),
             'url': str(self.event.get_absolute_url()),
             'id': self.id,
+            'speakers': [
+                { 'name': speaker.name
+                , 'url': str(speaker.get_absolute_url())
+                } for speaker in self.event.speakers.all()]
         }
 
-        if user:
+        if user and user.is_authenticated:
             is_favorited = user.favorites.filter(event_instance=self).exists()
             data['is_favorited'] = is_favorited
 
@@ -525,6 +529,7 @@ class Speaker(CampRelatedModel):
         Event,
         blank=True,
         help_text='The event(s) this speaker is anchoring',
+        related_name='speakers'
     )
 
     proposal = models.OneToOneField(
diff --git a/src/program/templates/event_list.html b/src/program/templates/event_list.html
index 216aa945..c3ffac7a 100644
--- a/src/program/templates/event_list.html
+++ b/src/program/templates/event_list.html
@@ -28,7 +28,7 @@
               <a href="{% url 'event_detail' camp_slug=camp.slug slug=event.slug %}">{{ event.title }}</a>
           </td>
           <td>
-            {% for speaker in event.speaker_set.all %}
+            {% for speaker in event.speakers.all %}
               <a href="{% url 'speaker_detail' camp_slug=camp.slug slug=speaker.slug %}">{{ speaker.name }}</a><br>
             {% empty %}
               N/A
diff --git a/src/program/templates/schedule_event_detail.html b/src/program/templates/schedule_event_detail.html
index c53a6028..61b95a70 100644
--- a/src/program/templates/schedule_event_detail.html
+++ b/src/program/templates/schedule_event_detail.html
@@ -22,10 +22,10 @@
 
     <hr>
 
-    {% if event.speaker_set.exists %}
+    {% if event.speakers.exists %}
       <h4>Speakers</h4>
       <div class="list-group">
-      {% for speaker in event.speaker_set.all %}
+      {% for speaker in event.speakers.all %}
       <h4><a href="{% url 'speaker_detail' camp_slug=camp.slug slug=speaker.slug %}" class="list-group-item">{{ speaker.name }}</a></h4>
       {% endfor %}
       </div>
diff --git a/src/program/templates/schedule_overview.html b/src/program/templates/schedule_overview.html
index 23f8cc7e..f95f3ece 100644
--- a/src/program/templates/schedule_overview.html
+++ b/src/program/templates/schedule_overview.html
@@ -34,7 +34,12 @@
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             <h4 class="modal-title"></h4>
           </div>
+          <div class="modal-body modal-body-content">
+          </div>
           <div class="modal-body">
+              <h4>Speaker(s):</h4>
+              <ul class="speakers">
+              </ul>
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Close</button>
@@ -94,13 +99,29 @@
             modal = modals[event_instance_id];
             modal_title = modal.getElementsByClassName('modal-title')[0];
             modal_title.innerHTML = payload['event_instance']['title']
-            modal_body = modal.getElementsByClassName('modal-body')[0];
-            modal_body.innerHTML = payload['event_instance']['abstract'];
+            modal_body_content = modal.getElementsByClassName('modal-body-content')[0];
+            modal_body_content.innerHTML = payload['event_instance']['abstract'];
             more_button = modal.getElementsByClassName('more-button')[0];
             more_button.setAttribute('href', payload['event_instance']['url']);
             favorite_button = modal.getElementsByClassName('favorite-button')[0];
-            favorite_button.setAttribute('data-state', payload['event_instance']['is_favorited'])
-            toggleFavoriteButton(favorite_button)
+            if(payload['event_instance']['is_favorited'] !== undefined) {
+                favorite_button.setAttribute('data-state', payload['event_instance']['is_favorited'])
+                toggleFavoriteButton(favorite_button);
+            } else {
+                favorite_button.remove();
+            }
+
+            speakers_div = modal.getElementsByClassName('speakers')[0];
+            speakers = payload['event_instance']['speakers'];
+            for(speaker_id in speakers) {
+                var speaker = speakers[speaker_id];
+                var speaker_li = document.createElement('li');
+                var speaker_a = document.createElement('a');
+                speaker_a.setAttribute('href', speaker['url']);
+                speaker_a.appendChild(document.createTextNode(speaker['name']));
+                speaker_li.appendChild(speaker_a);
+                speakers_div.appendChild(speaker_li);
+            }
         }
     });