diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ff25079..ba200b1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -213,9 +213,7 @@ class ApplicationController < LinguaFrancaApplicationController
 		expiry ||= (Time.now + 12.hours)
 		session[:confirm_uid] = user.id
 		UserMailer.send_mail :email_confirmation do
-			{
-				:args => EmailConfirmation.create(user_id: user.id, expiry: expiry, url: url)
-			}
+			EmailConfirmation.create(user_id: user.id, expiry: expiry, url: url)
 		end
 	end
 
diff --git a/config/environments/preview.rb b/config/environments/preview.rb
index 2f42f03..8c77f27 100644
--- a/config/environments/preview.rb
+++ b/config/environments/preview.rb
@@ -101,4 +101,5 @@ BikeBike::Application.configure do
 
 	I18n.config.language_detection_method = I18n::Config::DETECT_LANGUAGE_FROM_SUBDOMAIN
 	I18n.config.subdomain_format = 'preview-%'
+	I18n.config.host_locale_regex = /^preview\-([a-z]{2})\.[^\.]+\..*$/
 end