diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 969b23178..245db7edf 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -65,6 +65,10 @@ define('URLAUB_TOOLS',true);
 // LDAP_SERVER: Adresse des LDAP Servers
 define("LDAP_SERVER","www.technikum-wien.at");
 define("LDAP_BASE_DN","ou=People, dc=technikum-wien, dc=at");
+// Attribut fuer Zutrittskartennummer im LDAP
+define("LDAP_CARD_NUMBER","twHitagCardNumber");
+// Attribut fuer Zutrittskartennummer2 im LDAP
+define("LDAP_CARD_NUMBER2","twCardNumber");
 
 // Domain fuer Mailadressen etc.
 define('DOMAIN','technikum-wien.at');
diff --git a/config/wawi.config-default.inc.php b/config/wawi.config-default.inc.php
index c588ecabe..f6d8e3c8a 100644
--- a/config/wawi.config-default.inc.php
+++ b/config/wawi.config-default.inc.php
@@ -38,6 +38,10 @@ define('DOMAIN','technikum-wien.at');
 //LDAP_SERVER: Speichert die Adresse des LDAP Servers
 define("LDAP_SERVER","ldap.technikum-wien.at");
 define("LDAP_BASE_DN","ou=People, dc=technikum-wien, dc=at");
+// Attribut fuer Zutrittskartennummer im LDAP
+define("LDAP_CARD_NUMBER","twHitagCardNumber");
+// Attribut fuer Zutrittskartennummer2 im LDAP
+define("LDAP_CARD_NUMBER2","twCardNumber");
 
 // Mail-Adressen (Angabe von mehreren Addressen mit ',' getrennt moeglich)
 // Wenn MAIL_DEBUG gesetzt ist, werden alle Mails an diese Adresse gesendet
diff --git a/include/functions.inc.php b/include/functions.inc.php
index aa6d1a422..18889dd15 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -423,7 +423,7 @@ function getUidFromCardNumber($number)
 	    }
 
 	    // search for card id
-	    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
+	    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
 	    {
 			//print "failure: search in LDAP-tree failed<br>";
 			return false;
@@ -434,7 +434,7 @@ function getUidFromCardNumber($number)
 	    {
 	    	$number = "0".$number; 
 	    	 // search for card id 0[Number]
-		    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
+		    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
 		    {
 				//print "failure: search in LDAP-tree failed<br>";
 				return false;
@@ -443,7 +443,7 @@ function getUidFromCardNumber($number)
 		    {
 			    $number = "0".$number; 
 		    	 // search for card id 00[Number]
-			    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
+			    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
 			    {
 					//print "failure: search in LDAP-tree failed<br>";
 					return false;
@@ -452,7 +452,7 @@ function getUidFromCardNumber($number)
 			    {
 				    $number = "0".$number; 
 			    	// search for card id 000[Number]
-				    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
+				    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
 				    {
 						//print "failure: search in LDAP-tree failed<br>";
 						return false;
@@ -462,7 +462,7 @@ function getUidFromCardNumber($number)
 			    		$number = "0".$number; 
 
 				    	// search for card id 0000[Number]
-					    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
+					    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
 					    {
 							//print "failure: search in LDAP-tree failed<br>";
 							return false;
@@ -471,7 +471,7 @@ function getUidFromCardNumber($number)
 				    	{
 				    		$number = "0".$number; 
 					    	// search for card id 00000[Number]
-						    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
+						    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
 						    {
 								//print "failure: search in LDAP-tree failed<br>";
 								return false;
@@ -480,7 +480,7 @@ function getUidFromCardNumber($number)
 					    	{
 					    		$number = "0".$number; 
 								// search for card id 000000[Number]
-							    if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
+							    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
 							    {
 									//print "failure: search in LDAP-tree failed<br>";
 									return false;
@@ -535,7 +535,7 @@ function checkldapuser($username,$password)
 
 	    if (ldap_count_entries($connect, $res_id) != 1)
 	    {
-			print "failure: username $username found more than once<br>\n";
+			print "failure: username not found<br>\n";
 			return false;
 	    }
 
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass.php b/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass.php
index e513bd5de..ba1b2996d 100644
--- a/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass.php
+++ b/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass.php
@@ -123,7 +123,7 @@ $ldap_conn = ldap_connect("pdc1.technikum-wien.at",389);
 ldap_set_option($ldap_conn,LDAP_OPT_PROTOCOL_VERSION,3);
 $ldap_result = ldap_bind($ldap_conn);
 
-$ldap_search="(departmentNumber=*)";
+$ldap_search="(".LDAP_CARD_NUMBER."=*)";
 $ldap_result=ldap_search($ldap_conn, $ldap_basedn, $ldap_search);
 
 for ($ldapentry=ldap_first_entry($ldap_conn,$ldap_result); $ldapentry!=false; $ldapentry=ldap_next_entry($ldap_conn,$ldapentry))
@@ -162,7 +162,7 @@ for ($ldapentry=ldap_first_entry($ldap_conn,$ldap_result); $ldapentry!=false; $l
         }
      }
 
-     $ldapnumbers=ldap_get_values($ldap_conn,$ldapentry,"departmentnumber");
+     $ldapnumbers=ldap_get_values($ldap_conn,$ldapentry,LDAP_CARD_NUMBER);
 
      for ($n=0; $n < $ldapnumbers["count"]; $n++)
      {
diff --git a/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass_predelete.php b/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass_predelete.php
index 2f3591bb1..e4bcc921c 100755
--- a/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass_predelete.php
+++ b/vilesci/stammdaten/imexport/zutrittskarten/generatefromsipass_predelete.php
@@ -119,7 +119,7 @@ $ldap_conn = ldap_connect("pdc1.technikum-wien.at",389);
 ldap_set_option($ldap_conn,LDAP_OPT_PROTOCOL_VERSION,3);
 $ldap_result = ldap_bind($ldap_conn);
 
-$ldap_search="(departmentNumber=*)";
+$ldap_search="(".LDAP_CARD_NUMBER."=*)";
 $ldap_result=ldap_search($ldap_conn, $ldap_basedn, $ldap_search);
 
 for ($ldapentry=ldap_first_entry($ldap_conn,$ldap_result); $ldapentry!=false; $ldapentry=ldap_next_entry($ldap_conn,$ldapentry))
@@ -158,7 +158,7 @@ for ($ldapentry=ldap_first_entry($ldap_conn,$ldap_result); $ldapentry!=false; $l
         }
      }
 
-     $ldapnumbers=ldap_get_values($ldap_conn,$ldapentry,"departmentnumber");
+     $ldapnumbers=ldap_get_values($ldap_conn,$ldapentry,LDAP_CARD_NUMBER);
 
      for ($n=0; $n < $ldapnumbers["count"]; $n++)
      {