diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
index d4cb0264c..5dc03828d 100644
--- a/app/views/users/search.html.erb
+++ b/app/views/users/search.html.erb
@@ -1,29 +1,12 @@
 <div id="c-users">
   <div id="a-search">
-    <%= form_tag(users_path, :method => :get, :class => "simple_form") do %>
-      <%= search_field "name_matches", :label => "Name" %>
-
-      <div class="input">
-        <label for="search_level">Level</label>
-        <%= select("search", "level", [""] + User.level_hash.to_a) %>
-      </div>
-
-      <div class="input">
-        <label for="search_min_level">Min Level</label>
-        <%= select("search", "min_level", [""] + User.level_hash.to_a) %>
-      </div>
-
-      <div class="input">
-        <label for="search_max_level">Max Level</label>
-        <%= select("search", "max_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" %>
+    <%= simple_form_for(:search, url: users_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+      <%= f.input :name_matches, label: "Name", hint: "Use * for wildcard", input_html: { value: params[:search][:name_matches] } %>
+      <%= f.input :level, collection: User.level_hash.to_a, include_blank: true, selected: params[:search][:level] %>
+      <%= f.input :min_level, collection: User.level_hash.to_a, include_blank: true, selected: params[:search][:min_level] %>
+      <%= f.input :max_level, collection: User.level_hash.to_a, include_blank: true, selected: params[:search][:max_level] %>
+      <%= f.input :order, collection: [["Join date", "date"], ["Name", "name"], ["Upload count", "post_upload_count"], ["Note count", "note_count"], ["Post update count", "post_update_count"]], selected: params[:search][:order] %>
+      <%= f.submit "Search" %>
     <% end %>
   </div>
 </div>