diff --git a/avRegistration/login-directive/login-directive.js b/avRegistration/login-directive/login-directive.js
index 3d8dd805..e5d2929c 100644
--- a/avRegistration/login-directive/login-directive.js
+++ b/avRegistration/login-directive/login-directive.js
@@ -320,7 +320,7 @@ angular.module('avRegistration')
           }
           autheventid = scope.eventId = attrs.eventId = scope.csrf.eventId;
           scope.selectedAltMethod = scope.csrf.altAuthMethodId;
-          scope.loginUser(true);
+          scope.setLoginOIDC = true;
         } else {
           autheventid = scope.eventId = attrs.eventId;
         }
@@ -1026,6 +1026,9 @@ angular.module('avRegistration')
             ) {
               scope.loginUser(true);
             }
+            if (scope.setLoginOIDC) {
+              scope.loginUser(true);
+            }
         };
 
         scope.view = function(id) {
diff --git a/dist/appCommon-v10.3.0.js b/dist/appCommon-v10.3.0.js
index b64800a8..e21015b2 100644
--- a/dist/appCommon-v10.3.0.js
+++ b/dist/appCommon-v10.3.0.js
@@ -518,7 +518,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                     void redirectToLogin());
                 }()) return;
                 autheventid = scope.eventId = attrs.eventId = scope.csrf.eventId, scope.selectedAltMethod = scope.csrf.altAuthMethodId, 
-                scope.loginUser(!0);
+                scope.setLoginOIDC = !0;
             } else autheventid = scope.eventId = attrs.eventId;
             scope.orgName = ConfigService.organization.orgName;
             var autheventCookie = $cookies.get("authevent_" + adminId), authCookie = $cookies.get("auth_authevent_" + adminId);
@@ -700,7 +700,8 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 filledFields = _.filter(filledFields, function(el) {
                     return null !== el.value || "otp-code" === el.type;
                 });
-                !scope.isOpenId && filledFields.length !== scope.login_fields.length || scope.isOpenId || scope.isOtl || scope.isCensusQuery || scope.withCode || scope.oidcError || scope.loginUser(!0);
+                !scope.isOpenId && filledFields.length !== scope.login_fields.length || (scope.isOpenId || scope.isOtl || scope.isCensusQuery || scope.withCode || scope.oidcError || scope.loginUser(!0), 
+                scope.setLoginOIDC && scope.loginUser(!0));
             }, scope.view = function(id) {
                 Authmethod.viewEvent(id).then(function(altAuthMethod) {
                     "ok" === altAuthMethod.data.status ? (scope.base_authevent = angular.copy(altAuthMethod.data.events),