diff --git a/felamimail/inc/class.ajaxfelamimail.inc.php b/felamimail/inc/class.ajaxfelamimail.inc.php
index cf37b49115..6ca31abad2 100644
--- a/felamimail/inc/class.ajaxfelamimail.inc.php
+++ b/felamimail/inc/class.ajaxfelamimail.inc.php
@@ -1064,9 +1064,18 @@ class ajaxfelamimail
 			$preferences =& $boPreferences->getPreferences();
 			$Identities = $preferences->getIdentity($identity);
 			//error_log(print_r($Identities->signature,true));
-
 			$response = new xajaxResponse();
-			$response->addScript('setSignature('.$Identities->signature.');');
+			if ($Identities->signature)
+			{
+				$response->addScript('setSignature('.$Identities->signature.');');
+			}
+			else
+			{
+				$bosignatures	= CreateObject('felamimail.felamimail_bosignatures');
+				$defaultSig = $bosignatures->getDefaultSignature();
+				if ($defaultSig === false) $defaultSig = -1;
+				$response->addScript('setSignature('.$defaultSig.');');
+			}
 
 			return $response->getXML();
 		}