diff --git a/Layout/default/Cpeprovisioning/Index.php b/Layout/default/Cpeprovisioning/Index.php
index 1ca1df413..99a333eba 100644
--- a/Layout/default/Cpeprovisioning/Index.php
+++ b/Layout/default/Cpeprovisioning/Index.php
@@ -77,16 +77,16 @@
                 <td><?=$product->product->attributes['bras_type']->value?></td>
                 <td class="text-monospace">
                   <?php if($product->termination_id): ?>
-                    <span class="order-date-pill active">Public: <strong><?=$product->termination->building->pop->vlan_public?></strong></span>
-                    <span class="order-date-pill active">NAT: <strong><?=$product->termination->building->pop->vlan_nat?></strong></span>
-                    <span class="order-date-pill active">IPv6: <strong><?=$product->termination->building->pop->vlan_ipv6?></strong></span>
+                    <label class="order-date-pill active pointer">Public: <strong><?=$product->termination->building->pop->vlan_public?></strong> <input type="checkbox" name="router_vlan_public" /></label>
+                    <label class="order-date-pill active pointer">NAT: <strong><?=$product->termination->building->pop->vlan_nat?></strong> <input type="checkbox" name="router_vlan_nat" /></label>
+                    <label class="order-date-pill active pointer">IPv6: <strong><?=$product->termination->building->pop->vlan_ipv6?></strong> <input type="checkbox" name="router_vlan_ipv6" /></label>
                   <?php else: ?>
-                    <span class="order-date-pill active">Public: <strong><?=$product->product->attributes['vlan_default_public']->value?></strong></span>
-                    <span class="order-date-pill active">NAT: <strong><?=$product->product->attributes['vlan_default_nat']->value?></strong></span>
-                    <span class="order-date-pill active">IPv6: <strong><?=$product->product->attributes['vlan_default_ipv6']->value?></strong></span>
+                    <label class="order-date-pill active pointer">Public: <strong><?=$product->product->attributes['vlan_default_public']->value?></strong> <input type="checkbox" name="router_vlan_public" /></label>
+                    <label class="order-date-pill active pointer">NAT: <strong><?=$product->product->attributes['vlan_default_nat']->value?></strong> <input type="checkbox" name="router_vlan_nat" /></label>
+                    <label class="order-date-pill active pointer">IPv6: <strong><?=$product->product->attributes['vlan_default_ipv6']->value?></strong> <input type="checkbox" name="router_vlan_ipv6" /></label>
                   <?php endif; ?>
                 </td>
-                <td style="font-size: 18px; cursor:pointer;">
+                <td style="font-size: 18px; cursor:pointer; min-width: 180px;">
                   <?php
                   
                   $vot = false;
@@ -125,7 +125,7 @@
                 <td colspan="6">
                   
                   <div class="row">
-                    <div class="col-md-2">
+                    <div class="col-md-1">
                       
                       <div class="form-group">
                         <label for="router_type-<?=$product->id?>">Router</label>
@@ -150,13 +150,28 @@
                       
                     </div>
                     
-                    <div class="col-md-2">
+                    <div class="col-md-1">
                       <div class="form-group text-center">
-                        <label class="form-label" for="create_shipment_task-<?=$product->id?>">Versandauftrag erstellen</label>
+                        <label class="form-label" for="router_wifi_ssid-<?=$product->id?>">WLAN SSID</label>
+                        <input class="form-control" type="text" name="router_wifi_ssid" id="router_wifi_ssid-<?=$product->id?>" value="" />
+                      </div>
+                    </div>
+
+                    <div class="col-md-1">
+                      <div class="form-group">
+                        <label class="form-label" for="router_wifi_pass-<?=$product->id?>">WLAN Passwort</label>
+                        <input class="form-control" type="text" name="router_wifi_pass" id="router_wifi_pass-<?=$product->id?>" value="" />
+                      </div>
+                    </div>
+                    
+                    <div class="col-md-1">
+                      <div class="form-group text-center">
+                        <label class="form-label" for="create_shipment_task-<?=$product->id?>">Versandauftrag</label>
                         <input class="form-control" type="checkbox" value="1" name="create_shipment_task" id="create_shipment_task-<?=$product->id?>" <?=($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : ""?> />
                       </div>
                     </div>
                     
+                    
                     <div class="col-md-1">
                       <div class="form-group">
                         <label class="form-label" for="ship_weight-<?=$product->id?>">Gewicht</label>
diff --git a/public/assets/css/thetool.css b/public/assets/css/thetool.css
index 3a1c8754e..a5dee7412 100644
--- a/public/assets/css/thetool.css
+++ b/public/assets/css/thetool.css
@@ -290,4 +290,8 @@ td.controls {
 .bottom-no-border th {
   border-bottom: none;
   padding-bottom: 2px;
+}
+
+.pointer {
+  cursor: pointer;
 }
\ No newline at end of file