diff --git a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb
index 7865b201e..d78f7be8b 100644
--- a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb
+++ b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb
@@ -1,6 +1,9 @@
 <td>
   <%= link_to booth.name, admin_booth_path(booth) %>
 </td>
+<td>
+  <%= booth.location || t("admin.booths.index.no_location") %>
+</td>
 <% if booth_assignment.present? %>
   <td>
     <span class="verified"><%= t("admin.booth_assignments.manage.status.assigned") %></span>
diff --git a/app/views/admin/poll/booth_assignments/index.html.erb b/app/views/admin/poll/booth_assignments/index.html.erb
index 39435254b..75cbe889f 100644
--- a/app/views/admin/poll/booth_assignments/index.html.erb
+++ b/app/views/admin/poll/booth_assignments/index.html.erb
@@ -1,6 +1,5 @@
 <%= render "/admin/poll/polls/poll_header" %>
 
-
 <div id="poll-resources">
   <%= render "/admin/poll/polls/subnav" %>
   <%= render "search_booths" %>
@@ -30,7 +29,7 @@
               </strong>
             </td>
             <td>
-              <%= booth_assignment.booth.location %>
+              <%= booth_assignment.booth.location || t("admin.booths.index.no_location") %>
             </td>
           </tr>
         <% end %>
diff --git a/app/views/admin/poll/booth_assignments/manage.html.erb b/app/views/admin/poll/booth_assignments/manage.html.erb
index f55e85c74..a24fac478 100644
--- a/app/views/admin/poll/booth_assignments/manage.html.erb
+++ b/app/views/admin/poll/booth_assignments/manage.html.erb
@@ -13,6 +13,7 @@
   <table>
     <thead>
       <th><%= t("admin.booths.index.name") %></th>
+      <th><%= t("admin.booths.index.location") %></th>
       <th><%= t("admin.booth_assignments.manage.status.assign_status") %></th>
       <th class="text-right"><%= t("admin.actions.actions") %></th>
     </thead>
diff --git a/app/views/admin/poll/polls/booth_assignments.html.erb b/app/views/admin/poll/polls/booth_assignments.html.erb
index 819474852..ad5dc6211 100644
--- a/app/views/admin/poll/polls/booth_assignments.html.erb
+++ b/app/views/admin/poll/polls/booth_assignments.html.erb
@@ -11,7 +11,7 @@
       <% @polls.each do |poll| %>
         <tr id="<%= dom_id(poll) %>" class="poll">
           <td>
-            <strong><%= poll.name %></strong>
+            <strong><%= link_to poll.name, admin_poll_path(poll) %></strong>
           </td>
           <td>
             <%= l poll.starts_at.to_date %> - <%= l poll.ends_at.to_date %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 3826e9764..aa0fc0f8a 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -675,6 +675,7 @@ en:
         add_booth: "Add booth"
         name: "Name"
         location: "Location"
+        no_location: "No Location"
       new:
         title: "New booth"
         name: "Name"
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 9bc97c35f..2ff4449ec 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -677,6 +677,7 @@ es:
         add_booth: "Añadir urna"
         name: "Nombre"
         location: "Ubicación"
+        no_location: "Sin Ubicación"
       new:
         title: "Nueva urna"
         name: "Nombre"