diff --git a/include/items.php b/include/items.php
index f909fde6ad..0c9d54a330 100644
--- a/include/items.php
+++ b/include/items.php
@@ -813,28 +813,16 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 	$final_dfrn_id = '';
 
-	if($dfrn_version > 2.1) {
-		if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
-			openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
-			openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
-		}
-		else {
-			openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
-			openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
-		}
+
+	if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+		openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
+		openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
 	}
 	else {
-		if(($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
-			openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
-			openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
-		}
-		else {
-			openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
-			openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
-		}
+		openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
+		openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
 	}
 
-
 	$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
 
 	if(strpos($final_dfrn_id,':') == 1)
@@ -868,12 +856,21 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 		logger('rino: sent key = ' . $key);	
 
 
-	
-		if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
-			openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
+		if($dfrn_version >= 2.1) {	
+			if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+				openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
+			}
+			else {
+				openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+			}
 		}
 		else {
-			openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+			if(($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+				openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+			}
+			else {
+				openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
+			}
 		}
 
 		logger('md5 rawkey ' . md5($postvars['key']));
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 1eb2ff725a..cad7f95637 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -91,7 +91,7 @@ function dfrn_notify_post(&$a) {
 		logger('rino: md5 raw key: ' . md5($rawkey));
 		$final_key = '';
 
-		if($dfrn_version > 2.1) {
+		if($dfrn_version >= 2.1) {
 			if((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) {
 				openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
 			}