diff --git a/modules/ldap/lib/Auth/Process/AttributeAddFromLDAP.php b/modules/ldap/lib/Auth/Process/AttributeAddFromLDAP.php
index ed0cd81aec67162ed86b99f7952695aea988ed8d..fc08fb3c75ad4dc23c9f865787f4c4817f727159 100644
--- a/modules/ldap/lib/Auth/Process/AttributeAddFromLDAP.php
+++ b/modules/ldap/lib/Auth/Process/AttributeAddFromLDAP.php
@@ -218,10 +218,12 @@ class sspmod_ldap_Auth_Process_AttributeAddFromLDAP extends SimpleSAML_Auth_Proc
 
 		// handle [multiple] values
 		if(is_array($entries) && is_array($entries[0])){
-			$entry = $entries[0][strtolower($this->config['ldap_search_attribute'])];
 			$results = array();
-			for($i = 0; $i < $entry['count']; $i++){
-				$results[] = $entry[$i];
+			foreach($entries as $entry){
+				$entry = $entry[strtolower($this->config['ldap_search_attribute'])];
+				for($i = 0; $i < $entry['count']; $i++){
+					$results[] = $entry[$i];
+				}
 			}
 			$attributes[$this->config['new_attribute_name']] = array_values($results);
 		}