diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6d7a9d8c8..b4effb2db 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -20,6 +20,10 @@ class UsersController < ApplicationController
     respond_with(@users)
   end
   
+  def search
+    @search = User.search(params[:search])
+  end
+  
   def show
     @user = User.find(params[:id])
     @presenter = UserPresenter.new(@user)
diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb
index 449204998..f3c66565f 100644
--- a/app/views/users/_secondary_links.html.erb
+++ b/app/views/users/_secondary_links.html.erb
@@ -1,6 +1,7 @@
 <% content_for(:secondary_links) do %>
   <menu>
     <li><%= link_to "Listing", users_path %></li>
+    <li><%= link_to "Search", search_users_path %></li>
     <% if CurrentUser.is_anonymous? %>
       <li><%= link_to "Sign up", new_user_path %></li>
     <% end %>
diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
new file mode 100644
index 000000000..f44355405
--- /dev/null
+++ b/app/views/users/search.html.erb
@@ -0,0 +1,14 @@
+<div id="c-users">
+  <div id="a-search">
+    <%= simple_form_for(@search) do |f| %>
+      <%= f.input :name_matches, :required => false, :label => "Name" %>
+      <%= f.button :submit, "Search" %>
+    <% end %>
+  </div>
+</div>
+
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Users - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index f51fc018e..df2f22199 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -158,6 +158,7 @@ Danbooru::Application.routes.draw do
   resources :users do
     collection do
       get :upgrade_information
+      get :search
     end
     
     member do