comment

src/main/java/org/opengroup/osdu/azure/entitlements/service/EntitlementsAzure.java

@@ -460,10 +460,8 @@ public class EntitlementsAzure
             context.setUid(userPrincipal.getClaim("appid").toString());
             context.setOid(userPrincipal.getClaim("oid").toString());
         } else if (type == UserType.OTHER){
+            // non-AAD tokens
             String oId = userPrincipal.getClaim("email").toString();
-            if(StringUtils.isEmpty(oId)) {
-                oId = userPrincipal.getClaim("userid").toString();
-            }
             context.setOid(oId);
         }
         return context;