diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index b9231fe948bcce634185995a02a31a21d1494cf2..c518ceec51eedbc6a57ff6a8e5a41cedcf57d80e 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -1,7 +1,7 @@
 module PhotosHelper
   
   def linked_scaled_photo(photo, album)
-    link_to (image_tag photo.image.url(:scaled_full)), photo_path(album.next_photo(photo)), :rel => "prefetch"
+    link_to (image_tag photo.url(:scaled_full)), photo_path(album.next_photo(photo)), :rel => "prefetch"
   end
 
   def link_to_prev(photo, album)
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 24aa8e7f01c5b224723acd628ed1ec5f55831e84..67073924610edb717da83739281c336791b2658d 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -16,11 +16,11 @@
       = p.hidden_field :image_url, :value => @profile.image_url, :id => 'image_url_field'
       - for photo in @photos
         - if photo.url(:thumb_medium) == @profile.image_url
-          %div.small_photo{:id => photo.image.thumb_medium.url, :class=>'selected'}
+          %div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'}
             = check_box_tag 'checked_photo', true, true
             = link_to image_tag(photo.url(:thumb_medium)), "#"
         - else
-          %div.small_photo{:id => photo.image.thumb_medium.url}
+          %div.small_photo{:id => photo.url(:thumb_medium)}
             = check_box_tag 'checked_photo'
             = link_to image_tag(photo.url(:thumb_medium)), "#"
     =will_paginate @photos