diff --git a/app/controllers/proposal_controller.rb b/app/controllers/proposal_controller.rb
index 68803370..4dc7dd27 100644
--- a/app/controllers/proposal_controller.rb
+++ b/app/controllers/proposal_controller.rb
@@ -140,7 +140,7 @@ class ProposalController < ApplicationController
   def confirm
     if @event.transition_possible? :confirm
       begin
-        @event.confirm!
+        @event.confirm!(:send_mail => params[:send_mail])
       rescue Exception => e
         redirect_to(conference_proposal_index_path(:conference_id => @conference.short_title), :alert => "Event was NOT confirmed: #{e.message}")
         return
diff --git a/app/models/event.rb b/app/models/event.rb
index e653c4c7..4fb07981 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -98,7 +98,7 @@ class Event < ActiveRecord::Base
     self.class.state_machine.events_for(self.current_state).include?(transition)
   end
 
-  def process_confirmation
+  def process_confirmation(options)
     if self.conference.email_settings.send_on_confirmed_without_registration?
       if self.conference.registrations.where(:person_id => self.submitter.id).first.nil?
         Mailbot.confirm_reminder_mail(self).deliver
@@ -171,4 +171,4 @@ class Event < ActiveRecord::Base
     self.guid = guid
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/views/proposal/index.html.haml b/app/views/proposal/index.html.haml
index 435d1be4..e2da2c5f 100644
--- a/app/views/proposal/index.html.haml
+++ b/app/views/proposal/index.html.haml
@@ -27,7 +27,7 @@
               %td
                 .pull-right
                   - if event.transition_possible? :confirm
-                    = link_to "Confirm", conference_proposal_confirm_path(@conference.short_title, event), :method => :put, :class => "btn btn-mini btn-success"
+                    = link_to "Confirm", conference_proposal_confirm_path(@conference.short_title, event, :send_mail=>false), :method => :put, :class => "btn btn-mini btn-success"
                   - if @conference.cfp_open?
                     - if !event.unconfirmed? && !event.confirmed?
                       = link_to "Edit", edit_conference_proposal_path(@conference.short_title, event.id), :class => "btn btn-mini  btn-primary"