diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d3a09d9ed..5414ac03a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -12,7 +12,7 @@ class UsersController < ApplicationController
   def edit
     @user = User.first(:id => params[:id])
     @profile = @user.profile
-    @photos = Photo.all
+    @photos = Photo.paginate :page => params[:page], :order => 'created_at DESC'
   end
 
   def update
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0665430a0..22270d801 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -53,7 +53,7 @@
         .span-18.append-3.last
           = yield
         .span-3.last
-          = link_to (person_image_tag(current_user), root_path)
+          = link_to(person_image_tag(current_user), root_path)
           = link_to "Edit your profile", edit_user_path(current_user)
           %br
           %br
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 594647c29..565772fd6 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -17,6 +17,7 @@
           %div.small_photo{:id => photo.image.thumb_medium.url}
             = check_box_tag 'checked_photo'
             = link_to image_tag(photo.image.url(:thumb_medium)), "#"
+    =will_paginate @photos
 
 
     %h3 Info