diff --git a/app/models/photo.rb b/app/models/photo.rb
index 68a138531..db0caaa82 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -44,12 +44,13 @@ class Photo < Post
   def remote_photo= remote_path
     name_start = remote_path.rindex '/'
     self.remote_photo_path = remote_path.slice(0, name_start )
-    self.remote_photo_name = remote_path.slice(name_start, remote_path.length)
+    self.remote_photo_name = remote_path.slice(name_start + 1, remote_path.length)
   end
 
   def url(name = nil)
     if remote_photo_path
-      person.url.chop + remote_photo_path + name.to_s + remote_photo_name
+      name = name.to_s + "_" if name
+      person.url.chop + remote_photo_path + "/" + name.to_s + remote_photo_name
     else
       image.url name
     end
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index e6734639a..e15dcb0d5 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -8,7 +8,7 @@
       = link_to post.album.name, object_path(post.album)
 
     %br
-  = link_to (image_tag post.image.url(:thumb_large)), object_path(post)
+  = link_to (image_tag post.url(:thumb_large)), object_path(post)
     
   %div.time
     = link_to(how_long_ago(post), photo_path(post))
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index e258ad781..b0ad79b83 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -114,6 +114,9 @@ describe Photo do
 
       @photo.save
       @photo.reload
+      
+      url = @photo.url
+      thumb_url = @photo.url :thumb_medium
 
       xml = @photo.to_diaspora_xml
       id = @photo.id
@@ -123,6 +126,8 @@ describe Photo do
       
       new_photo = Photo.first(:id => id)
       new_photo.url.nil?.should be false
+      new_photo.url.include?(url).should be true
+      new_photo.url(:thumb_medium).include?(thumb_url).should be true
     end
   end
 end