diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb
index 8de8af670..0b99ea9f5 100644
--- a/app/views/admin/poll/polls/_form.html.erb
+++ b/app/views/admin/poll/polls/_form.html.erb
@@ -1,34 +1,46 @@
 <%= form_for [:admin, @poll] do |f| %>
   <div class="row">
     <div class="small-12 medium-6 column">
-      <%= f.text_field :name,
-                       placeholder: t('admin.polls.form.name'),
-                       label:       t("admin.polls.form.name") %>
+      <%= f.text_field :name %>
     </div>
   </div>
 
   <div class="row">
     <div class="small-12 medium-6 column">
-      <%= f.label :starts_at, t("admin.polls.form.starts_at") %>
       <%= f.text_field :starts_at,
-                        label: false,
                         value: @poll.starts_at.present? ? l(@poll.starts_at.to_date) : nil,
                         class: "js-calendar-full" %>
     </div>
 
     <div class="small-12 medium-6 column">
-      <%= f.label :ends_at, t("admin.polls.form.ends_at") %>
       <%= f.text_field :ends_at,
-                        label: false,
                         value: @poll.ends_at.present? ? l(@poll.ends_at.to_date) : nil,
                         class: "js-calendar-full" %>
     </div>
   </div>
 
+  <div class="row">
+    <div class="small-6 medium-6 column">
+      <%= f.check_box :geozone_restricted, data: { checkbox_toggle: "#geozones" } %>
+    </div>
+  </div>
+
+  <div id="geozones" style="<%= @poll.geozone_restricted? ? '' : 'display:none' %>">
+    <div class="row">
+      <%= f.collection_check_boxes(:geozone_ids, @geozones, :id, :name) do |b| %>
+        <div class="small-6 medium-3 column">
+          <%= b.label do %>
+            <%= b.check_box + b.text %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+
   <div class="row">
     <div class="small-12 medium-4 column">
       <%= f.submit t("admin.polls.#{admin_submit_action(@poll)}.submit_button"),
                    class: "button success expanded" %>
     </div>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/admin/poll/questions/_form.html.erb b/app/views/admin/poll/questions/_form.html.erb
index dbc8883e3..e5c228b4e 100644
--- a/app/views/admin/poll/questions/_form.html.erb
+++ b/app/views/admin/poll/questions/_form.html.erb
@@ -29,17 +29,6 @@
                           ckeditor: { language: I18n.locale } %>
       </div>
 
-      <div class="row">
-        <%= f.collection_check_boxes(:geozone_ids, @geozones, :id, :name) do |b| %>
-          <div class="small-6 medium-3 column">
-            <%= b.label do %>
-              <%= b.check_box + b.text %>
-            <% end %>
-          </div>
-        <% end %>
-      </div>
-      <%# TODO include all link %>
-
       <div class="row">
         <div class="actions small-12 medium-4 column margin-top">
           <%= f.submit(class: "button expanded", value: t("shared.save")) %>
@@ -48,4 +37,4 @@
     </div>
   </div>
 
-<% end %>
\ No newline at end of file
+<% end %>