diff --git a/pcp-reloaded/de/anmeldung.php b/pcp-reloaded/de/anmeldung.php
index 2e5ece09147099eb146598e5fdf0d2eb48976e31..66633462d75327571710e05d3f6a485f12cd722f 100644
--- a/pcp-reloaded/de/anmeldung.php
+++ b/pcp-reloaded/de/anmeldung.php
@@ -83,15 +83,6 @@ else {
 
 							<div class="col-12"><h3>Teilnahme</h3></div>
 
-          <div class="control-group">
-            <div class="form-group floating-label-form-group controls">
-							<div class="col-2"><label>Pre-Workshop/Hackathon</label></div>
-							<div class="col-10">
-									<input id="participation" type="checkbox" name="Workshop_20" value="yes"/>Mittwoch, 20. Oktober<br/>
-									<input id="participation" type="checkbox" name="Workshop_21" value="yes"/>Donnerstag, 21. Oktober<br/>
-              </div>
-						</div>
-					</div>
           <div class="control-group">
              <div class="form-group floating-label-form-group controls">
 							<div class="col-2"><label>Konferenz</label></div>
@@ -102,6 +93,18 @@ else {
 		        </div>
            </div>
           </div>
+          <div class="control-group">
+            <div class="form-group floating-label-form-group controls">
+							<div class="col-2"><label>Hackathon und Workshop</label></div>
+							<div class="col-10">
+									<input id="participation" type="checkbox" name="Hackathon" value="yes"/>Hackathon 28.10.-02.12.<br/>
+									<input id="participation" type="checkbox" name="Workshop_01" value="yes"/>Mittwoch, 01. Dezember<br/>
+									<input id="participation" type="checkbox" name="Workshop_02" value="yes"/>Donnerstag, 02. Dezember<br/>
+              </div>
+						</div>
+					</div>
+
+
 							<div class="col-12"><h3>Weitere Informationen für das Organisationsteam</h3></div>
           <div class="control-group">
             <div class="form-group floating-label-form-group controls">
@@ -122,4 +125,4 @@ else {
 
 </div>
 
-<?php } ?>
\ No newline at end of file
+<?php } ?>
diff --git a/pcp-reloaded/en/registration.php b/pcp-reloaded/en/registration.php
index 8ac9a5e91a3e12124765f4efa0d04878215b51b0..e92f1182db7a196eddef26d80c497790ef93d6e6 100644
--- a/pcp-reloaded/en/registration.php
+++ b/pcp-reloaded/en/registration.php
@@ -82,15 +82,6 @@ else {
 
 							<div class="col-12"><h3>Participation</h3></div>
 
-          <div class="control-group">
-            <div class="form-group floating-label-form-group controls">
-							<div class="col-2"><label>Pre-Workshop/Hackathon</label></div>
-							<div class="col-10">
-									<input id="participation" type="checkbox" name="Workshop_20" value="yes"/>Wednesday, October 20th<br/>
-									<input id="participation" type="checkbox" name="Workshop_21" value="yes"/>Thursday, October 21st<br/>
-              </div>
-						</div>
-					</div>
           <div class="control-group">
              <div class="form-group floating-label-form-group controls">
 							<div class="col-2"><label>Main Conference</label></div>
@@ -101,6 +92,16 @@ else {
 		        </div>
            </div>
           </div>
+          <div class="control-group">
+            <div class="form-group floating-label-form-group controls">
+							<div class="col-2"><label>Hackathon and Workshop</label></div>
+							<div class="col-10">
+									<input id="participation" type="checkbox" name="Hackathon" value="yes"/>Hackathon 28.10.-02.12.<br/>							
+									<input id="participation" type="checkbox" name="Workshop_01" value="yes"/>Wednesday, December 1st<br/>
+									<input id="participation" type="checkbox" name="Workshop_02" value="yes"/>Thursday, December 2nd<br/>
+              </div>
+						</div>
+					</div>
 							<div class="col-12"><h3>Further information for the organizing team</h3></div>
           <div class="control-group">
             <div class="form-group floating-label-form-group controls">
@@ -121,4 +122,4 @@ else {
 
 </div>
 
-<?php } ?>
\ No newline at end of file
+<?php } ?>