diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index f2194fb61..3a7769b2a 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -834,11 +834,26 @@ class prestudent extends person
 				$stg_obj = new studiengang();
 				$stg_obj->load($studiengang_kz);
 			    if($stg_obj->typ=='m')
-					$qry.=" AND a.rolle='Interessent' AND a.zgvmas_code is not null AND a.zgvmas_erfuellt = 't'";
+				{
+					$qry.=" AND a.rolle='Interessent' AND a.zgvmas_code is not null";
+
+					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+						$qry .= " AND a.zgvmas_erfuellt = 't'";
+				}
 				elseif($stg_obj->typ=='p')
-					$qry.=" AND a.rolle='Interessent' AND a.zgvdoktor_code is not null AND a.zgvdoktor_erfuellt = 't'";
+				{
+					$qry.=" AND a.rolle='Interessent' AND a.zgvdoktor_code is not null";
+
+					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
+						$qry .= " AND a.zgvdoktor_erfuellt = 't'";
+				}
 				else
-					$qry.=" AND a.rolle='Interessent' AND a.zgv_code is not null AND a.zgv_erfuellt = 't'";
+				{
+					$qry.=" AND a.rolle='Interessent' AND a.zgv_code is not null";
+
+					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+						$qry .= " AND a.zgv_erfuellt = 't'";
+				}
 				break;
 			case "reihungstestangemeldet":
 				$qry.="