diff --git a/data-access/servlet/src/main/java/auth/oidc/webapi/IA2TokenConvFilter.java b/data-access/BACKUP/auth/IA2TokenConvFilter.java
similarity index 100%
rename from data-access/servlet/src/main/java/auth/oidc/webapi/IA2TokenConvFilter.java
rename to data-access/BACKUP/auth/IA2TokenConvFilter.java
diff --git a/data-access/servlet/src/main/java/auth/authz/AuthPolicy.java b/data-access/servlet/src/main/java/auth/authz/AuthPolicy.java
index dc37a64ca3337552881347c3cbd62317565ae160..1c5efc13c36da3e58c87f610f4e2d7061b916691 100644
--- a/data-access/servlet/src/main/java/auth/authz/AuthPolicy.java
+++ b/data-access/servlet/src/main/java/auth/authz/AuthPolicy.java
@@ -71,12 +71,13 @@ public class AuthPolicy
       }
       else
       {
-         if(principal instanceof VlkbUser)
+         if(principal instanceof it.inaf.ia2.aa.data.User)
          {
-            VlkbUser vlkbUser = (VlkbUser) principal;
+            it.inaf.ia2.aa.data.User vlkbUser = (it.inaf.ia2.aa.data.User) principal;
 
-            userName   = vlkbUser.getName();
-            userGroups = vlkbUser.getGroupsAsArray();
+            userName = vlkbUser.getName();
+            List<String> groups = vlkbUser.getGroups();
+            userGroups = groups.toArray(new String[0]);
             userGroupsValid = true;
 
             access = Access.PUBLIC_AND_AUTHORIZED_PRIVATE;
diff --git a/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml b/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml
index 9bd042b9f11c3081468d64ef838302ecf0725ed7..b14435c663b14409a4db930366a6ae086883c421 100644
--- a/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml
+++ b/data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml
@@ -21,16 +21,6 @@
                 <url-pattern>/*</url-pattern>
         </filter-mapping>
 
-        <filter>
-                <filter-name>UserTypeConverter</filter-name>
-                <filter-class>IA2TokenConvFilter</filter-class>
-        </filter>
-
-        <filter-mapping>
-                <filter-name>UserTypeConverter</filter-name>
-                <url-pattern>/*</url-pattern>
-        </filter-mapping>
-
         <filter>
                 <filter-name>AuthZFilter</filter-name>
                 <filter-class>AuthZFilter</filter-class>