diff --git a/views/includes/modal_response.pug b/views/includes/modal_response.pug
index 0f24468..89fd943 100644
--- a/views/includes/modal_response.pug
+++ b/views/includes/modal_response.pug
@@ -8,29 +8,25 @@
           span(aria-hidden='true') ×
       #responseModalBody.modal-body
         form#send_response.was-validated(action=einsatzdaten.uuid, method="POST")
-          input(type="hidden" name="waip_id" value=einsatzdaten.id)
+          input(type="hidden" name="waip_id" value=einsatzdaten.uuid)
           .form-group
             p.text-muted Ich komme als ...
             .custom-control.custom-radio.form-control-lg
-              input(type='hidden' name='radio_ek' value='0')
-              input#radios_res_ek.custom-control-input(type='radio', name='radio_ek', value='1')
+              input#radios_res_ek.custom-control-input(type='radio', name='radio_efunction', value='ek', required='')
               label.custom-control-label(for='radios_res_ek')
                 | Einsatzkraft
             .custom-control.custom-radio.form-control-lg
-              input(type='hidden' name='radio_ma' value='0')
-              input#radios_res_ma.custom-control-input(type='radio', name='radio_ma', value='1')
+              input#radios_res_ma.custom-control-input(type='radio', name='radio_efunction', value='ma', required='')
               label.custom-control-label(for='radios_res_ma')
                 | Maschinist
             .custom-control.custom-radio.form-control-lg
-              input(type='hidden' name='radio_fk' value='0')
-              input#radios_res_fk.custom-control-input(type='radio', name='radio_fk', value='1')
+              input#radios_res_fk.custom-control-input(type='radio', name='radio_efunction', value='fk', required='')
               label.custom-control-label(for='radios_res_fk')
                 | Führungskraft
               .invalid-feedback wählen Sie eine Einsatzfunktion!
           div.border-top.my-3
           .form-group
             .custom-control.custom-switch.form-control-lg
-              input(type='hidden' name='cb_agt' value='0')
               input#cb_res_agt.custom-control-input(type='checkbox', name='cb_agt', value='1')
               label.custom-control-label.text-warning(for='cb_res_agt')
                 | und bin Atemschutzgeräteträger!