diff --git a/mod/poke.php b/mod/poke.php
index 851396e68..f4660e624 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -107,6 +107,21 @@ function poke_content(&$a) {
 		return;
 	}
 
+	$name = '';
+	$id = '';
+
+	if(intval($_GET['c'])) {
+		$r = q("select id,name from contact where id = %d and uid = %d limit 1",
+			intval($_GET['c']),
+			intval(local_user())
+		);
+		if(count($r)) {
+			$name = $r[0]['name'];
+			$id = $r[0]['id'];
+		}
+	}
+
+
 	$base = $a->get_baseurl();
 
 	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
@@ -146,7 +161,9 @@ EOT;
 		'$clabel' => t('Recipient'),
 		'$choice' => t('Choose what you wish to do to recipient'),
 		'$verbs' => $shortlist,
-		'$submit' => t('Submit')
+		'$submit' => t('Submit'),
+		'$name' => $name,
+		'$id' => $id
 	));
 
 	return $o;
diff --git a/view/poke_content.tpl b/view/poke_content.tpl
index 09b3d8db4..f81d04c6c 100644
--- a/view/poke_content.tpl
+++ b/view/poke_content.tpl
@@ -8,8 +8,8 @@
 
 <div id="poke-recip-label">$clabel</div>
 <br />
-<input id="recip" type="text" size="64" maxlength="255" value="" name="pokename" autocomplete="off">
-<input id="recip-complete" type="hidden" value="" name="cid">
+<input id="recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off">
+<input id="recip-complete" type="hidden" value="$id" name="cid">
 
 <br />
 <br />