X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7b57119146d7a7c648fb2888b0d019d1e64b7a3e..4b20afd51e640d67a32b241349be9d2f7eac64b0:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index ed17c1e41..649c0c907 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -95,9 +95,9 @@ class UserController < ApplicationController
         flash[:notice] = t 'user.new.flash create success message', :email => @user.email
         Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
         session[:token] = @user.tokens.create.token
-        redirect_to :action => 'login'
+        redirect_to :action => 'login', :referer => params[:referer]
       else
-        render :action => 'new'
+        render :action => 'new', :referer => params[:referer]
       end
     end
   end
@@ -503,7 +503,7 @@ private
   def choose_layout
     if [ 'api_details' ].include? action_name
       nil
-    elsif [ 'login', 'new', 'terms'].include? action_name
+    elsif params[:referer] == url_for(:controller => :oauth, :action => :oauthorize, :only_path => true)
       'slim'
     else
       'site'