Correct origin in confirm links

Author: nygrenh

app/mailers/user_mailer.rb

@@ -13,7 +13,7 @@ def email_confirmation(user, origin = nil, language = nil)
     subject = "#{origin}: #{subject}" if origin
     if origin
       origin_name = origin.downcase.tr(' ', '_').gsub(/[\.\/]/, '')
-      @url += "?origin=#{CGI.escape(origin_name)}"
+      @url = base_url + confirm_email_path(@user.id, token.token, language: language, origin: CGI.escape(origin_name))
       template_path = Rails.root.join('config', 'email_templates', 'user_mailer', 'email_confirmation')
       html_template_path = template_path.join("#{origin_name}.html.erb")
       text_template_path = template_path.join("#{origin_name}.text.erb")