diff --git a/ldap.siga.php b/ldap.siga.php
index dcec119..91bc6a5 100644
--- a/ldap.siga.php
+++ b/ldap.siga.php
@@ -1,10 +1,10 @@
 <?php
 
-function getSignatureAll($siga_start_html, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $main_telnumber, $ldap_extention, $ldap_pager, $siga_postfix) {
-  return $siga_start_html . $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",<br>" . $ldap_title . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $siga_postfix;
+function getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $main_telnumber, $ldap_extention, $ldap_pager, $siga_postfix) {
+  return $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",<br>" . $ldap_title . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $siga_postfix;
 }
 
-function getSignatureManager($siga_start_html, $siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $ldap_support_mail, $siga_url, $main_telnumber, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix) {
-  return $siga_start_html . $siga_marketing_start . $ldap_facs_to_webaskio . $siga_marketing_end . $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",<br>" . $ldap_title . $ldap_support_mail . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $ldap_im . $siga_postfix;
+function getSignatureManager($siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $ldap_support_mail, $siga_url, $main_telnumber, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix, $siga_postfix_end_with_marketing) {
+  return $siga_marketing_start . $ldap_facs_to_webaskio . $siga_marketing_end . $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",<br>" . $ldap_title . $ldap_support_mail . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $ldap_im . $siga_postfix . $siga_postfix_end_with_marketing;
 }
 ?>
diff --git a/thunderbird.php b/thunderbird.php
index 52f0797..e1a5d69 100644
--- a/thunderbird.php
+++ b/thunderbird.php
@@ -85,17 +85,25 @@ $entry_manager = ldap_first_entry($link, $result_manager);
 
 if($entry_manager == false) {
   if($ldap_gid == $ldap_target_gid) {
-    $signature = getSignatureManager($siga_start_html, $siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $ldap_support_mail, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix);
-} else {
-    $signature = getSignatureAll($siga_start_html, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix);
+    if (isset($info[0]["facsimiletelephonenumber"][0])) {
+      $signature = getSignatureManager($siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $ldap_support_mail, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix, $siga_postfix_end_with_marketing);
+    } else {
+      $signature = getSignatureManager("", "", "", $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $ldap_support_mail, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix, "");
+    }
+  } else {
+    $signature = getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix);
   }
 } else {
   $ldap_attributes = ldap_get_attributes($link, $entry_manager);
   $counter = $ldap_attributes["count"];
   if($counter < 1) {
-    $signature = getSignatureAll($siga_start_html, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix);
+    $signature = getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix);
   } else {
-    $signature = getSignatureManager($siga_start_html, $siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, "", $siga_url, $telnumber_manager, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix);
+    if (isset($info[0]["facsimiletelephonenumber"][0])) {
+      $signature = getSignatureManager($siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, "", $siga_url, $telnumber_manager, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix, $siga_postfix_end_with_marketing);
+    } else {
+      $signature = getSignatureManager("", "", "", $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, "", $siga_url, $telnumber_manager, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix, "");
+    }
   }
 }