diff --git a/app/controllers/admin/conference_controller.rb b/app/controllers/admin/conference_controller.rb
index 25e04343..34cd0d10 100644
--- a/app/controllers/admin/conference_controller.rb
+++ b/app/controllers/admin/conference_controller.rb
@@ -92,15 +92,15 @@ module Admin
         @conference.email_settings.updated_conference_registration_dates_template
           Mailbot.conference_registration_date_update_mail(@conference).deliver
         end
+      end
 
-        if @conference.update_attributes(params[:conference])
-          redirect_to(edit_admin_conference_path(id: @conference.short_title),
-                      notice: 'Conference was successfully updated.')
-        else
-          redirect_to(edit_admin_conference_path(id: short_title),
-                      alert: 'Updating conference failed. ' \
-                      "#{@conference.errors.full_messages.join('. ')}.")
-        end
+      if @conference.update_attributes(params[:conference])
+        redirect_to(edit_admin_conference_path(id: @conference.short_title),
+                    notice: 'Conference was successfully updated.')
+      else
+        redirect_to(edit_admin_conference_path(id: short_title),
+                    alert: 'Updating conference failed. ' \
+                    "#{@conference.errors.full_messages.join('. ')}.")
       end
     end
 
diff --git a/app/controllers/proposal_controller.rb b/app/controllers/proposal_controller.rb
index 04597565..bce1856f 100644
--- a/app/controllers/proposal_controller.rb
+++ b/app/controllers/proposal_controller.rb
@@ -56,7 +56,7 @@ class ProposalController < ApplicationController
     registration = current_user.registrations.where(conference_id: @conference.id).first
     ahoy.track 'Event submission', title: 'New submission'
     if registration.nil?
-      redirect_to(register_conference_path(@conference.short_title),
+      redirect_to(conference_register_path(@conference.short_title),
                   alert: 'Event was successfully submitted.
                  You should register for the conference now.')
     else