diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 3d6408bcfe..c72c784453 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -11,6 +11,10 @@ function diaspora2bb($s) {
 	$s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
 	$s = Markdown($s);
 	$s = html2bbcode($s);
+
+//	$s = preg_replace('/\[url=(.+?)\<em\>(.+?)\]/ism','[url=$1_$2]',$s);
+//	$s = preg_replace('/\[url=(.+?)\<\/em\>(.+?)\]/ism','[url=$1_$2]',$s);
+
 	return $s;
 
 }
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 870e4f2fba..23bdd7388e 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -849,10 +849,12 @@ function dfrn_notify_content(&$a) {
 			openssl_private_encrypt($hash,$challenge,$prv_key);
 			openssl_private_encrypt($id_str,$encrypted_id,$prv_key);
 		}
-		else {
+		elseif(strlen($pub_key)) {
 			openssl_public_encrypt($hash,$challenge,$pub_key);
 			openssl_public_encrypt($id_str,$encrypted_id,$pub_key);
 		}
+		else
+			$status = 1;
 
 		$challenge    = bin2hex($challenge);
 		$encrypted_id = bin2hex($encrypted_id);