diff --git a/flag_friend.module b/flag_friend.module
index 3fc3753..b12917a 100644
--- a/flag_friend.module
+++ b/flag_friend.module
@@ -98,7 +98,13 @@
       case FLAG_FRIEND_FLAGGED:
         // Make this link into a remove link with
         $vars['action'] = 'unflag';
-        $vars['link_href'] = str_replace('flag/confirm/flag', 'flag/confirm/unfriend', $vars['link_href']);
+        if ($vars['flag']->link_type == 'confirm') {
+            $vars['link_href'] = str_replace('flag/confirm/flag', 'flag/confirm/unfriend', $vars['link_href']);
+        }
+        else {
+            $vars['link_href'] = str_replace('flag/flag', 'flag/confirm/unfriend', $vars['link_href']);
+            $vars['flag_classes'] = str_replace('flag-link-toggle', 'flag-link-confirm', $vars['flag_classes']);
+        }
         $vars['link_text'] = t($vars['flag']->unflag_short);
         $vars['flag_name_css'] = 'unfriend';
         $vars['link_title'] = t($vars['flag']->unflag_long);
@@ -478,6 +484,9 @@
     default:
       // unfriend
       $question = $flag->get_label('unflag_confirmation', $content_id);
+      if (!$question) {
+        $question = t('Are you sure you want to remove this user from your list of friends?');
+      }
       break;
   }
   $cancel = array_key_exists('destination', $_GET) ? $_GET['destination'] : 'user/' . $content_id;