diff --git a/app/models/services/facebook.rb b/app/models/services/facebook.rb
index e644c4638..26f0e93ce 100644
--- a/app/models/services/facebook.rb
+++ b/app/models/services/facebook.rb
@@ -20,8 +20,13 @@ class Services::Facebook < Service
     response = RestClient.get("https://graph.facebook.com/me/friends", {:params => {:access_token => self.access_token}})
     data = JSON.parse(response.body)['data']
 
-    Hash[*data.collect {|v|
+    data_h = Hash[*data.collect {|v|
       [v['id'], {:name => v['name']}]
     }.flatten]
+
+    service_objects = Services::Facebook.where(:uid => data_h.keys).includes(:user => :person)
+    service_objects.each{|s| data_h[s.uid][:person] = s.user.person}
+
+    data_h
   end
 end
diff --git a/app/views/services/finder.html.haml b/app/views/services/finder.html.haml
index f4d2ae36f..bde66a67d 100644
--- a/app/views/services/finder.html.haml
+++ b/app/views/services/finder.html.haml
@@ -14,7 +14,9 @@
     - for friend in @friends
       %li
         %h4.name
-          = link_to friend['name'], '#'
-        /.right
-        /= aspect_membership_button(aspect, contact, contact.person)
+          = link_to friend[:name], '#'
+
+      - if friend[:person]
+        .right
+          = aspect_membership_button(aspect, contact, contact.person)
 
diff --git a/spec/models/services/facebook_spec.rb b/spec/models/services/facebook_spec.rb
index 8b895195f..62cac352a 100644
--- a/spec/models/services/facebook_spec.rb
+++ b/spec/models/services/facebook_spec.rb
@@ -32,7 +32,8 @@ describe Services::Facebook do
       @user2 = Factory(:user)
       @user2_fb_id = '820651'
       @user2_fb_name = 'Maxwell Salzberg'
-      @user2.services << Factory.build(:service, :provider => 'facebook' , :uid => @user2_fb_id)
+      @user2_service = Services::Facebook.create(:uid => @user2_fb_id, :access_token => "yo")
+      @user2.services << @user2_service
       @fb_list_hash =  <<JSON
       {
         "data": [
@@ -49,25 +50,25 @@ JSON
     end
 
     it 'requests a friend list' do
-      RestClient.should_receive(:get).with("https://graph.facebook.com/me/friends", {:params => {:access_token => @service.access_token}}).and_return(@web_mock)
-      @service.finder
+      RestClient.should_receive(:get).with("https://graph.facebook.com/me/friends", {:params => {:access_token => @user2_service.access_token}}).and_return(@web_mock)
+      @user2_service.finder
     end
 
     context 'returns a hash' do
       it 'returns a hash' do
-        @service.finder.class.should == Hash
+        @user2_service.finder.class.should == Hash
       end
       it 'contains a name' do
-        @service.finder.values.include?({:name => @user2_fb_name}).should be_true
+        @user2_service.finder.values.first[:name].should == @user2_fb_name
       end
       it 'contains a photo url' do
         pending
       end
       it 'contains a FB id' do
-        @service.finder.include?(@user2_fb_id).should be_true
+        @user2_service.finder.include?(@user2_fb_id).should be_true
       end
       it 'contains a diaspora person object' do
-        pending
+        @user2_service.finder.values.first[:person].should == @user2.person
       end
     end