diff --git a/lib/WebGUI/Operation/Friends.pm b/lib/WebGUI/Operation/Friends.pm
index b20b68ac4..6334aab51 100644
--- a/lib/WebGUI/Operation/Friends.pm
+++ b/lib/WebGUI/Operation/Friends.pm
@@ -84,7 +84,7 @@ sub www_addFriend {
         ),
         WebGUI::Form::hidden($session,
             {
-                name  => 'friendId',
+                name  => 'userId',
                 value => $friendId,
             }
         ),
@@ -123,10 +123,15 @@ sub www_addFriendSave {
 	my $session = shift;
 	return $session->privilege->insufficient() unless ($session->user->isRegistered);
 
-    my $friendId = $session->form->get('friendId');
+    my $friendId = $session->form->get('userId');
     my $protoFriend = WebGUI::User->new($session, $friendId);
     my $i18n = WebGUI::International->new($session, 'Friends');
 
+    my $friends = WebGUI::Friends->new($session);
+    if($friends->isFriend($friendId) || $friends->isInvited($friendId)) {
+        return www_addFriend($session);
+    }
+
     # Check for non-existant user id.
     if ((!$protoFriend->username) || (!$protoFriend->profileField('ableToBeFriend'))) {
         my $output = sprintf qq!<h1>%s</h1>\n<p>%s</p><a href="%s">%s</a>!,