diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 5a8ac02466321321383b5be611043d45535e730e..83be96b78045cc624c10cee8a8f50b84a4b6a50a 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1461,9 +1461,12 @@ class plugin
 
       $ui = get_userinfo();
 
-      $addAttrs['callerDN']   = $ui->dn;
-      $addAttrs['callerCN']   = $ui->cn;
-      $addAttrs['callerUID']  = $ui->uid;
+      $addAttrs['callerDN']         = $ui->dn;
+      $addAttrs['callerCN']         = $ui->cn;
+      $addAttrs['callerUID']        = $ui->uid;
+      $addAttrs['callerSN']         = $ui->sn;
+      $addAttrs['callerGIVENNAME']  = $ui->givenName;
+
       $addAttrs['dn']         = $this->dn;
       $addAttrs['location']   = $config->current['NAME'];
 
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index a489b3e9e882f9d3782a46a5352ccdfc3622c960..8fd9d0dfe45519deae4c397a8f50d1e6e4beb59a 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -36,6 +36,8 @@ class userinfo
   var $ip;
   var $cn;
   var $uid;
+  var $sn           = '';
+  var $givenName    = '';
   var $gidNumber    = -1;
   var $language     = "";
   var $subtreeACL   = array();
@@ -67,6 +69,12 @@ class userinfo
     if (isset($attrs['gidNumber'][0])) {
       $this->gidNumber = $attrs['gidNumber'][0];
     }
+    if (isset($attrs['sn'][0])) {
+      $this->sn = $attrs['sn'][0];
+    }
+    if (isset($attrs['givenName'][0])) {
+      $this->givenName = $attrs['givenName'][0];
+    }
 
     /* Assign user language */
     if (isset($attrs['preferredLanguage'][0])) {