diff --git a/src/main/java/at/klausbetz/provider/AppleUserAttributeMapper.java b/src/main/java/at/klausbetz/provider/AppleUserAttributeMapper.java
new file mode 100644
index 0000000..c219cac
--- /dev/null
+++ b/src/main/java/at/klausbetz/provider/AppleUserAttributeMapper.java
@@ -0,0 +1,19 @@
+package at.klausbetz.provider;
+
+import org.keycloak.broker.oidc.mappers.UserAttributeMapper;
+
+public class AppleUserAttributeMapper extends UserAttributeMapper {
+
+    private static final String[] cp = new String[] { AppleIdentityProviderFactory.PROVIDER_ID };
+
+    @Override
+    public String[] getCompatibleProviders() {
+        return cp;
+    }
+
+
+    @Override
+    public String getId() {
+            return "apple-user-attribute-mapper";
+        }
+}
diff --git a/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper b/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
index 1231423..2bc2768 100644
--- a/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
+++ b/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
@@ -1 +1,2 @@
-at.klausbetz.provider.AppleUsernameTemplateMapper
\ No newline at end of file
+at.klausbetz.provider.AppleUsernameTemplateMapper
+at.klausbetz.provider.AppleUserAttributeMapper
\ No newline at end of file