diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9d0a0e44a..6721d7445 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -291,15 +291,12 @@ class ApplicationController < ActionController::Base
 	# Returns the current user or nil if no user is logged in
 	# and starts a session if needed
 	def find_current_user
-		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
-		uid_logger("user setup start2: session[:user_aa_id] is #{session[:user_aa_id]}")
-		uid_logger("user setup start3: session[:user_aa_id] is #{session[:"#{request.subdomain}"]}")
-		uid_logger("user setup start3: session[:user_aa_id] is #{session[:"#{request.subdomain.split('.').first}_user_id"]}")
+		re_subdomain = "#{request.subdomain.split('.').first}_user_id"
 
-		Rails.logger.info("find current_user: subdomain is #{request.subdomain} and user session is #{session[:user_id]} -- #{session[:"#{request.subdomain}_user_id"]}")
-		if session[:"#{request.subdomain}_user_id"]
+		Rails.logger.info("find current_user: subdomain is #{request.subdomain} and user session is #{session[:user_id]} -- #{session[:"#{re_subdomain}"]}")
+		if session[:"#{re_subdomain}"]
 			# existing session
-			(User.active.find(session[:"#{request.subdomain}_user_id"]) rescue nil)
+			(User.active.find(session[:"#{re_subdomain}"]) rescue nil)
 		elsif autologin_user = try_to_autologin
 			autologin_user
 		elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index a95723690..4e51db9c6 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -62,9 +62,10 @@ module LoginHelper
   end
 
   def start_user_session(user)
-    session[:"#{request.subdomain}_user_id"] = user.id
-    Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{request.subdomain}_user_id"]}")
-    Rails.logger.info("user_id session is: 3333332222111#{session[:"#{request.subdomain}_user_id"]}")
+    re_subdomain = "#{request.subdomain.split('.').first}_user_id"
+    session[:"#{re_subdomai}"] = user.id
+    Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{re_subdomai}"]}")
+    Rails.logger.info("user_id session is: 3333332222111#{session[:user_id]}")
 
     # if current_laboratory.main_site?
     #   session[:user_id] = user.id