diff --git a/app/views/admin/valuators/_valuator.html.erb b/app/views/admin/valuators/_valuator.html.erb
deleted file mode 100644
index e5971391b..000000000
--- a/app/views/admin/valuators/_valuator.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="small-12 column">
-  <h3><%= t('admin.valuators.valuator.user_found') %></h3>
-
-  <table>
-    <tr>
-      <td>
-        <%= valuator.name %>
-      </td>
-      <td>
-        <%= valuator.email %>
-      </td>
-    </tr>
-  </table>
-
-  <% unless @valuator.persisted? %>
-    <%= form_for @valuator, url: admin_valuators_path do |f| %>
-      <div class="row">
-        <div class="small-12 medium-4 column ">
-          <%= f.text_field :description, label: false, placeholder: t('admin.valuators.valuator.description_placeholder') %>
-          <%= f.hidden_field :user_id %>
-        </div>
-        <div class="small-12 medium-2 column end" style="border:ddotted 10px red;">
-          <%= f.submit t('admin.valuators.valuator.add'), class: "button success float-left" %>
-        </div>
-      </div>
-    <% end %>
-  <% end %>
-</div>
diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb
index 8ca18322d..4663a944b 100644
--- a/app/views/admin/valuators/search.html.erb
+++ b/app/views/admin/valuators/search.html.erb
@@ -9,9 +9,17 @@
     <tr>
       <td><%= user.name %></td>
       <td><%= user.email %></td>
-      <td>
+      <td class="float-right">
         <% if user.valuator? && user.valuator.description.present? %>
           <%= user.valuator.description %>
+        <% else %>
+          <%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %>
+            <%= f.text_field :description,
+                             label: false,
+                             placeholder: t("admin.valuators.valuator.description_placeholder") %>
+            <%= f.hidden_field :user_id %>
+            <%= f.submit t("admin.valuators.valuator.add"), class: "button success float-left" %>
+          <% end %>
         <% end %>
       </td>
     </tr>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index e94f803c5..b44179ab2 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -454,7 +454,6 @@ en:
         title: Valuators
       valuator:
         description_placeholder: 'Description (optional)'
-        user_found: User found
         add: Add to valuators
       search:
         title: 'Valuators: User search'
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 48ea7b4d2..53e01b38b 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -454,7 +454,6 @@ es:
         title: Evaluadores
       valuator:
         description_placeholder: "Descripción (opcional)"
-        user_found: Usuario encontrado
         add: Añadir como evaluador
       search:
         title: 'Evaluadores: Búsqueda de usuarios'
diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb
index 10db62933..86f2c89e9 100644
--- a/spec/features/admin/valuators_spec.rb
+++ b/spec/features/admin/valuators_spec.rb
@@ -2,30 +2,30 @@ require 'rails_helper'
 
 feature 'Admin valuators' do
   background do
-    @admin = create(:administrator)
-    @user  = create(:user, username: 'Jose Luis Balbin')
+    @admin    = create(:administrator)
+    @user     = create(:user, username: 'Jose Luis Balbin')
     @valuator = create(:valuator)
     login_as(@admin.user)
     visit admin_valuators_path
   end
 
   scenario 'Index' do
-    expect(page).to have_content @valuator.name
-    expect(page).to have_content @valuator.email
-    expect(page).to_not have_content @user.name
+    expect(page).to have_content(@valuator.name)
+    expect(page).to have_content(@valuator.email)
+    expect(page).to_not have_content(@user.name)
   end
 
-  pending 'Create Valuator', :js do
+  scenario 'Create Valuator', :js do
     fill_in 'name_or_email', with: @user.email
     click_button 'Search'
 
-    expect(page).to have_content @user.name
+    expect(page).to have_content(@user.name)
     fill_in 'valuator_description', with: 'environmental expert'
     click_button 'Add to valuators'
 
-    within("#valuators") do
-      expect(page).to have_content @user.name
-      expect(page).to have_content 'environmental expert'
+    within('#valuators') do
+      expect(page).to have_content(@user.name)
+      expect(page).to have_content('environmental expert')
     end
   end