diff --git a/app/assets/javascripts/osem.js b/app/assets/javascripts/osem.js
index 5d3d4428..21dd66c8 100644
--- a/app/assets/javascripts/osem.js
+++ b/app/assets/javascripts/osem.js
@@ -242,3 +242,13 @@ $.extend( $.fn.dataTableExt.oPagination, {
     }
 } );
 
+/* Commodity function for modal windows */
+
+window.build_dialog = function(selector, content) {
+  // Close it and remove content if it's already open
+  $("#" + selector).modal('hide');
+  $("#" + selector).remove();
+  // Add new content and pops it up
+  $("body").append("<div id=\"" + selector + "\" class=\"modal fade\" role=\"dialog\">\n" + content + "</div>");
+  $("#" + selector).modal();
+}
diff --git a/app/controllers/admin/speakers_controller.rb b/app/controllers/admin/speakers_controller.rb
new file mode 100644
index 00000000..e80a2f9f
--- /dev/null
+++ b/app/controllers/admin/speakers_controller.rb
@@ -0,0 +1,17 @@
+class Admin::SpeakersController < ApplicationController
+  before_filter :verify_organizer
+  respond_to :js, :html
+
+  def edit
+    @event = @conference.events.find(params[:event_id])
+    @speaker = @event.event_people.where(:event_role => "speaker").first
+  end
+
+  def update
+    @event = @conference.events.find(params[:event_id])
+    @speaker = @event.event_people.where(:event_role => "speaker").first
+    @speaker.person_id = params[:speaker][:person_id]
+    @speaker.save
+    respond_with @speaker, :location => admin_conference_events_path(@conference.short_title)
+  end
+end
diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml
index 9b6401f3..e5b7e47b 100644
--- a/app/views/admin/events/index.html.haml
+++ b/app/views/admin/events/index.html.haml
@@ -101,12 +101,15 @@
             %b Title
           %th
             %b Submitter
+          %th
+            %b Speaker
           %th
             %b Type
           %th
             %b Track
           %th
             %b State
+          %th
         - @events.each do |event|
           %tr
             %td
@@ -124,6 +127,13 @@
                   (Unregistered!)
               - else
                 Unknown submitter
+            %td
+              - if speaker = event.speakers.first
+                = link_to speaker.public_name, admin_person_path(speaker)
+              - else
+                Unknown speaker
+              - l = link_to "Change", edit_admin_conference_event_speaker_path(@conference.short_title, event), :remote => true
+              = "(#{l})".html_safe
             %td
               = event.event_type.title
             %td
@@ -180,4 +190,4 @@
     $("#events-stats1-link").click(function() {
          $("#events-stats1").toggle();
     });
-  });
\ No newline at end of file
+  });
diff --git a/app/views/admin/speakers/_form.html.haml b/app/views/admin/speakers/_form.html.haml
new file mode 100644
index 00000000..56c3b738
--- /dev/null
+++ b/app/views/admin/speakers/_form.html.haml
@@ -0,0 +1,11 @@
+.modal-header
+  %button.close{:type => "button", :data => {:dismiss => "modal"}} &times;
+  %h3
+    Assign speaker
+= semantic_form_for @speaker, :as => :speaker, :url => admin_conference_event_speaker_path(@conference.short_title, @event), :method => :put do |f|
+  .form-inputs.form-horizontal.modal-body
+    = f.collection_select(:person_id, Person.order(:public_name), :id, :public_name)
+
+  .modal-footer
+    = link_to "Close", "#", :data => {:dismiss => "modal"}, :class => 'btn'
+    = f.button "Assign", :class => 'btn btn-primary'
diff --git a/app/views/admin/speakers/edit.js.erb b/app/views/admin/speakers/edit.js.erb
new file mode 100644
index 00000000..0c28c11f
--- /dev/null
+++ b/app/views/admin/speakers/edit.js.erb
@@ -0,0 +1,2 @@
+build_dialog('edit_speaker', '<%=  j render :partial => 'form' %>');
+
diff --git a/config/routes.rb b/config/routes.rb
index f0221624..4fc2797d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -34,6 +34,7 @@ Osem::Application.routes.draw do
           put :update_state
           put :update_track
         end
+        resource :speaker, :only => [:edit, :update]
       end
       resources :supporters
     end