diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4e9f94c24..8851f3c8e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -57,11 +57,15 @@ module ApplicationHelper
   end
 
   def person_image_tag(person)
+    image_tag image_or_default(person), :class => "avatar", :alt => person.real_name, :title => person.real_name, "data-person_id" => person.id
+  end
+
+  def image_or_default(person)
     image_location = person.profile.image_url
     image_location ||= "/images/user/default.png"
-
-    image_tag image_location, :class => "avatar", :alt => person.real_name, :title => person.real_name, "data-person_id" => person.id
+    image_location
   end
+  
 
   def person_image_link(person)
     link_to person_image_tag(person), object_path(person)
diff --git a/app/views/publics/hcard.erb b/app/views/publics/hcard.erb
index 6b8ab3209..5102897a5 100644
--- a/app/views/publics/hcard.erb
+++ b/app/views/publics/hcard.erb
@@ -36,13 +36,9 @@
       <dl class="entity_photo">
         <dt>Photo</dt>
         <dd>
-        <img class="photo avatar" src="<%= @person.profile.image_url%>" width="100" height="100"/>
+        <img class="photo avatar" src="<%= image_or_default(@person)%>" width="100" height="100"/>
         </dd>
       </dl>
-      <dl class="entity_note">
-        <dt>Note</dt>
-        <dd class="note">Diaspora is awesome! vi is better than emacs!</dd>
-      </dl>
     </div>
   </div>
 </div>
diff --git a/public/images/user/default.jpg b/public/images/user/default.jpg
deleted file mode 100644
index b242c1e1c..000000000
Binary files a/public/images/user/default.jpg and /dev/null differ