diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb index 242a658ef..212a8e12b 100644 --- a/web/app/controllers/users_controller.rb +++ b/web/app/controllers/users_controller.rb @@ -228,9 +228,6 @@ class UsersController < ApplicationController if !@user.nil? && !@user.errors.any? UserMailer.welcome_message(@user).deliver - sign_in @user - redirect_to :client - return elsif !@user.nil? # new user with validation errors; logger.debug("#{@user} has errors. can not sign in until remedied. #{@user.errors.inspect}") diff --git a/web/app/views/users/signup_confirm.html.erb b/web/app/views/users/signup_confirm.html.erb index 5dac7548f..7fdb14f82 100644 --- a/web/app/views/users/signup_confirm.html.erb +++ b/web/app/views/users/signup_confirm.html.erb @@ -1,8 +1,7 @@ <% provide(:title, 'Signup Confirmation') %> <% if @user.nil? %> -
@@ -13,5 +12,14 @@ Please proceed to <%= link_to 'the home page', root_path %> and log in.
<% else %> - The server had a problem. Please try to confirm your email later. ++ You have successfully confirmed this email address. +
++ You can proceed to the website <%= link_to 'home page', root_path %> and sign in, or close this page in your browser. +
<% end %>