diff --git a/app/views/admin/ilias_interface/edit_content.php b/app/views/admin/ilias_interface/edit_content.php
index f54a62d909d163c803a95305b8fa5df8b5e3b6a1..f9c0b87321872cb6408eeac32b3b5edd7de319ab 100644
--- a/app/views/admin/ilias_interface/edit_content.php
+++ b/app/views/admin/ilias_interface/edit_content.php
@@ -45,7 +45,7 @@
         <? endif ?>
     </label>
     <label>
-        <span><?= _('Datenfeld (Name) mit Matrikelnummer (wenn leer, wird keine Matrikelnummer übergeben)') ?></span>
+        <span><?= _('Datenfeld (Name) mit Matrikelnummer (nur ausfüllen, wenn die Matrikelnummer in einem Datenfeld gespeichert wird)') ?></span>
         <input type="text" name="ilias_matriculation" size="50" maxlength="255" value="<?= htmlReady($ilias_config['matriculation']) ?>">
     </label>
     <? if (count($ilias_datafields)) : ?>
diff --git a/lib/ilias_interface/IliasUser.php b/lib/ilias_interface/IliasUser.php
index da360827689c7fb147355e080cd18f3b04ce4141..c44b3ec149840a907ee0370cdd56b23852653e4f 100644
--- a/lib/ilias_interface/IliasUser.php
+++ b/lib/ilias_interface/IliasUser.php
@@ -111,7 +111,7 @@ class IliasUser
     function getStudipUserData()
     {
         $query = "SELECT username, password, title_front, title_rear, Vorname,
-                         Nachname, Email, privatnr, privadr, geschlecht
+                         Nachname, Email, privatnr, privadr, geschlecht, matriculation_number
                   FROM auth_user_md5
                   LEFT JOIN  user_info USING (user_id)
                   WHERE user_id = ?";
@@ -146,6 +146,8 @@ class IliasUser
                     $this->matriculation = $entry->getDisplayValue();
                 }
             }
+        } else {
+            $this->matriculation = $data['matriculation_number'];
         }
 
         if ($this->title_front != '') {