diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index ad4f04a020..08b3ae57d8 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -18,7 +18,7 @@
  */
 
 class UnsubscribeAction extends Action {
-	
+
 	function handle($args) {
 		parent::handle($args);
 		if (!common_logged_in()) {
@@ -36,28 +36,40 @@ class UnsubscribeAction extends Action {
 		# CSRF protection
 
 		$token = $this->trimmed('token');
-		
+
 		if (!$token || $token != common_session_token()) {
 			$this->client_error(_('There was a problem with your session token. Try again, please.'));
 			return;
 		}
 
-		$other_nickname = $this->arg('unsubscribeto');
-		$result=subs_unsubscribe_user($user,$other_nickname);
-		if($result!=true) {
+		$other_id = $this->arg('unsubscribeto');
+
+        if (!$other_id) {
+            $this->client_error(_('No profile id in request.'));
+            return;
+        }
+
+        $other = Profile::staticGet('id', $other_id);
+
+        if (!$other_id) {
+            $this->client_error(_('No profile with that id.'));
+            return;
+        }
+
+		$result = subs_unsubscribe_to($user, $other);
+
+		if ($result != true) {
 			common_user_error($result);
 			return;
 		}
 
-		$profile = Profile::staticGet('nickname', $other_nickname);
-		
 		if ($this->boolean('ajax')) {
 			common_start_html('text/xml');
 			common_element_start('head');
 			common_element('title', null, _('Unsubscribed'));
 			common_element_end('head');
 			common_element_start('body');
-			common_subscribe_form($profile);
+			common_subscribe_form($other);
 			common_element_end('body');
 			common_element_end('html');
 		} else {
diff --git a/lib/util.php b/lib/util.php
index 666a715dd6..eb5667f6a9 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -2059,10 +2059,10 @@ function common_unsubscribe_form($profile) {
 									   'class' => 'unsubscribe',
 									   'action' => common_local_url('unsubscribe')));
 	common_hidden('token', common_session_token());
-	common_element('input', array('id' => 'unsubscribeto-' . $profile->nickname,
+	common_element('input', array('id' => 'unsubscribeto-' . $profile->id,
 								  'name' => 'unsubscribeto',
 								  'type' => 'hidden',
-								  'value' => $profile->nickname));
+								  'value' => $profile->id));
 	common_element('input', array('type' => 'submit',
 								  'class' => 'submit',
 								  'value' => _('Unsubscribe')));