diff --git a/jans-casa/extras/casa-external_fido2.py b/jans-casa/extras/casa-external_fido2.py
index 2b6644a136a..69a8c9367d8 100644
--- a/jans-casa/extras/casa-external_fido2.py
+++ b/jans-casa/extras/casa-external_fido2.py
@@ -73,6 +73,11 @@ def authenticate(self, configurationAttributes, requestParameters, step):
             print "Fido2. Authenticate for step 1"
             identity.setWorkingParameter("platformAuthenticatorAvailable",ServerUtil.getFirstValue(requestParameters, "loginForm:platformAuthenticator"))
 
+            # Modified for Casa compliance
+            authenticated_user = authenticationService.getAuthenticatedUser()
+            if authenticated_user != None:
+                return True
+                
             user_password = credentials.getPassword()
             logged_in = False
             if StringHelper.isNotEmptyString(user_name) and StringHelper.isNotEmptyString(user_password):
diff --git a/jans-casa/extras/casa-external_super_gluu.py b/jans-casa/extras/casa-external_super_gluu.py
index 02318885182..4105e1c342f 100644
--- a/jans-casa/extras/casa-external_super_gluu.py
+++ b/jans-casa/extras/casa-external_super_gluu.py
@@ -259,7 +259,11 @@ def authenticate(self, configurationAttributes, requestParameters, step):
 
                 return True
             elif self.twoStep:
-                authenticated_user = self.processBasicAuthentication(credentials)
+                # Modified for Casa compliance
+                authenticated_user = authenticationService.getAuthenticatedUser()
+                if authenticated_user == None:
+                    authenticated_user = self.processBasicAuthentication(credentials)
+
                 if authenticated_user == None:
                     return False