diff --git a/app/views/admin/booths/edit.html.haml b/app/views/admin/booths/edit.html.haml
index 0cac17e7..5beb3e18 100644
--- a/app/views/admin/booths/edit.html.haml
+++ b/app/views/admin/booths/edit.html.haml
@@ -2,4 +2,4 @@
   Editing
   = @booth.title
 
-= render 'booths/form'
+= render 'booths/form', booth: @booth, conference: @conference
diff --git a/app/views/admin/booths/new.html.haml b/app/views/admin/booths/new.html.haml
index 0cf6adb5..4633548d 100644
--- a/app/views/admin/booths/new.html.haml
+++ b/app/views/admin/booths/new.html.haml
@@ -1,3 +1,3 @@
 %h1 New #{t'booth'}
 
-= render 'booths/form'
+= render 'booths/form', booth: @booth, conference: @conference
diff --git a/app/views/admin/booths/show.html.haml b/app/views/admin/booths/show.html.haml
index 02d44609..adf6af17 100644
--- a/app/views/admin/booths/show.html.haml
+++ b/app/views/admin/booths/show.html.haml
@@ -20,6 +20,11 @@
           %b Reasoning
         %td
           = markdown(@booth.reasoning)
+      %tr
+        %td.col-md-2
+          %b Email
+        %td
+          = markdown(@booth.email)
       %tr
         %td.col-md-2
           %b Website
@@ -47,6 +52,12 @@
               = responsibles.email
               )
               = " , " unless i == @booth.responsibles.length - 1
+      %tr
+        %td.col-md-2
+          %b Special Requirements
+        %td
+          - if @booth.special_requirements.present?
+            = @booth.special_requirements
       %tr
         %td.col-md-2
           %b Submitted on
diff --git a/app/views/booths/_form.html.haml b/app/views/booths/_form.html.haml
index b9a0e511..6877f987 100644
--- a/app/views/booths/_form.html.haml
+++ b/app/views/booths/_form.html.haml
@@ -10,6 +10,7 @@
         = f.input :submitter_relationship, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true,
           label: 'Submitter\'s relation',
           hint: 'e.g. employee, comunity manager, etc'
+        = f.input :email, hint: 'Contact email address for your stand. This will be public.'
         = f.input :website_url
         = responsibles_selector_input f
         = f.input :invite_responsible,
@@ -17,6 +18,25 @@
         = image_tag f.object.picture.thumb.url if f.object.picture?
         = f.input :picture
 
+        %p.text-right
+          = link_to '#requirements', 'data-toggle' => 'collapse' do
+            Do you have any special requirements?
+        #requirements{ class: "collapse #{ 'in' if booth.special_requirements.present? }" }
+          = f.input :special_requirements, input_html: { rows: 5 }, label: 'Requirements', placeholder: 'Eg. Whiteboard, printer, or something like that.'
+
+        - unless conference.code_of_conduct.blank?
+          - code_of_conduct_link = link_to 'Code of Conduct', '#',
+            data: { toggle: 'modal', target: '#modal-code-of-conduct'}
+          - if booth.accepted_code_of_conduct
+            = fa_icon 'check-square-o'
+            I have read and accepted the
+            = code_of_conduct_link
+          - else
+            = f.input :accepted_code_of_conduct,
+            label: "I have read and accept the #{code_of_conduct_link}".html_safe,
+            required: true
+          = render 'conferences/code_of_conduct', organization: conference.organization
+
         %p.text-right
           - if @booth.new_record?
             = f.submit "Create #{(t'booth').capitalize } Request", class: 'btn btn-success'
diff --git a/app/views/booths/edit.html.haml b/app/views/booths/edit.html.haml
index 9f60196d..11ed9bbc 100644
--- a/app/views/booths/edit.html.haml
+++ b/app/views/booths/edit.html.haml
@@ -3,4 +3,4 @@
     Editing
     = @booth.title
 
-  = render 'form'
+  = render 'form', booth: @booth, conference: @conference
diff --git a/app/views/booths/new.html.haml b/app/views/booths/new.html.haml
index 6713d312..11e469d4 100644
--- a/app/views/booths/new.html.haml
+++ b/app/views/booths/new.html.haml
@@ -1,4 +1,4 @@
 .container
   %h1 Request a #{t'booth'}
 
-  = render 'form'
+  = render 'form', booth: @booth, conference: @conference
diff --git a/app/views/booths/show.html.haml b/app/views/booths/show.html.haml
index 22634b0a..21a950d5 100644
--- a/app/views/booths/show.html.haml
+++ b/app/views/booths/show.html.haml
@@ -21,6 +21,11 @@
             %b Reasoning
           %td
             = markdown(@booth.reasoning)
+        %tr
+          %td.col-md-2
+            %b Email
+          %td
+            = markdown(@booth.email)
         %tr
           %td.col-md-2
             %b Website
@@ -49,6 +54,12 @@
                   = responsibles.email
                   )
                 = ", " unless i == @booth.responsibles.length - 1
+        %tr
+          %td.col-md-2
+            %b Special Requirements
+          %td
+            - if @booth.special_requirements.present?
+              = @booth.special_requirements
         %tr
           %td.col-md-2
             %b Submitted on