diff --git a/include/diaspora.php b/include/diaspora.php
index 0be2392d17..b14c38f1d3 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -789,9 +789,10 @@ function diaspora_share($me,$contact) {
 	$myaddr = $me['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
 	$theiraddr = $contact['addr'];
 
+logger('diaspora_share: contact: ' . print_r($contact,true), LOGGER_DATA);
 	$tpl = get_markup_template('diaspora_share.tpl');
 	$msg = replace_macros($tpl, array(
-		'$sender' => myaddr,
+		'$sender' => $myaddr,
 		'$recipient' => $theiraddr
 	));
 
diff --git a/mod/contacts.php b/mod/contacts.php
index f130b74c04..efb0dc75b2 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -141,7 +141,7 @@ function contacts_content(&$a) {
 
 		$cmd = $a->argv[2];
 
-		$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1",
 			intval($contact_id),
 			intval(local_user())
 		);
@@ -222,7 +222,7 @@ function contacts_content(&$a) {
 			}
 
 
-			contact_remove($contact_id);
+			contact_remove($orig_record[0]['id']);
 			info( t('Contact has been removed.') . EOL );
 			goaway($a->get_baseurl() . '/contacts');
 			return; // NOTREACHED