diff --git a/include/student.class.php b/include/student.class.php
index b0448cce9..4618ddbcd 100644
--- a/include/student.class.php
+++ b/include/student.class.php
@@ -567,11 +567,17 @@ class student extends benutzer
 	 * @param studiengang_kz
 	 * @return true wenn ok, false im Fehlerfall
 	 */
-	public function load_person($person_id, $studiengang_kz)
+	public function load_person($person_id, $studiengang_kz = null)
 	{
 		$qry = "SELECT tbl_student.* FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid)
-				WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER)." AND studiengang_kz=".$this->db_add_param($studiengang_kz, FHC_INTEGER)."
-				ORDER BY prestudent_id DESC LIMIT 1";
+				WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER);
+				
+		if($studiengang_kz != '')
+		{
+			$qry .= " AND studiengang_kz=".$this->db_add_param($studiengang_kz, FHC_INTEGER);
+		}
+
+		$qry .= " ORDER BY prestudent_id DESC LIMIT 1";
 
 		if($this->db_query($qry))
 		{