diff --git a/conf/attribute-resolver.xml b/conf/attribute-resolver.xml
index 5352cbe..38ace8b 100644
--- a/conf/attribute-resolver.xml
+++ b/conf/attribute-resolver.xml
@@ -141,9 +141,14 @@
         <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrimaryAffiliation"/>
     </AttributeDefinition>
 
+    <!--
     <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalName">
         <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrincipalName"/>
     </AttributeDefinition>
+    -->
+    <AttributeDefinition xsi:type="Scoped" id="eduPersonPrincipalName" scope="%{idp.scope}">
+        <InputDataConnector ref="myLDAP" attributeNames="uid"/>
+    </AttributeDefinition>
 
     <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalNamePrior">
         <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrincipalNamePrior"/>