Merge branch 'pull/5182'

diff --combined app/controllers/users_controller.rb
index bc1baf8a59208e682f5c6b60689ae46e0024e7bf,3ba914210edd50fbbb4989ae24d65373f8f94804..fc893c9c3194f6c40a65ce61e1d73e9824ba0747
--- 1/app/controllers/users_controller.rb
--- 2/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@@ -38,9 -38,7 +38,9 @@@ class UsersController < ApplicationCont
        users = users.where(:status => @params[:status]) if @params[:status]
        users = users.where(:creation_ip => @params[:ip]) if @params[:ip]
  
 -      @users_count = users.count
 +      @users_count = users.limit(501).count
 +      @users_count = I18n.t("count.at_least_pattern", :count => 500) if @users_count > 500
 +
        @users, @newer_users_id, @older_users_id = get_page_items(users, :limit => 50)
  
        render :partial => "page" if turbo_frame_request_id == "pagination"
@@@ -269,6 -267,7 +269,7 @@@
      current_user.data_public = true
      current_user.description = "" if current_user.description.nil?
      current_user.creation_ip = request.remote_ip
+     current_user.creation_address = request.remote_ip
      current_user.languages = http_accept_language.user_preferred_languages
      current_user.terms_agreed = Time.now.utc
      current_user.tou_agreed = Time.now.utc