diff --git a/app/models/user.rb b/app/models/user.rb
index a54ddbd11..51a8177d5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -560,6 +560,23 @@ class User < ActiveRecord::Base
         q = q.where("id = ?", params[:id].to_i)
       end
       
+      case params[:order]
+      when "name"
+        q = q.order("name")
+        
+      when "post_upload_count"
+        q = q.order("post_upload_count desc")
+        
+      when "note_count"
+        q = q.order("note_update_count desc")
+        
+      when "post_update_count" 
+        q = q.order("post_update_count desc")
+        
+      else
+        q = q.order("created_at desc")
+      end
+      
       q
     end
   end
diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
index b2c7a9714..0438cb07f 100644
--- a/app/views/users/search.html.erb
+++ b/app/views/users/search.html.erb
@@ -13,6 +13,11 @@
         <%= select("search", "min_level", [""] + User.level_hash.to_a) %>
       </div>
       
+      <div class="input">
+        <label for="search_order">Order</label>
+        <%= select("search", "order", [["Join date", "date"], ["Name", "name"], ["Upload count", "post_upload_count"], ["Note count", "note_count"], ["Post update count", "post_update_count"]]) %>
+      </div>
+      
       <%= submit_tag "Search" %>
     <% end %>
   </div>