diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a56b8010d..609738f6e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -110,12 +110,12 @@ class ApplicationController < ActionController::Base
         message = 'authentication failed'
       end
 
-      # remember user
-      session[:user_id] = userdata.id
-
       # return auth ok
       if message == ''
 
+        # remember user
+        session[:user_id] = userdata.id
+
         # set basic auth user to current user
         current_user_set(userdata)
         return {