diff --git a/Layout/default/User/Form.php b/Layout/default/User/Form.php
index 0648b718f..c3e6357b2 100644
--- a/Layout/default/User/Form.php
+++ b/Layout/default/User/Form.php
@@ -50,7 +50,7 @@
                 <select name="address_id" id="address_id" class="form-control">
                   <option value=""></option>
                   <?php foreach($addresses as $address): ?>
-                  <option value="<?=$address->id?>" <?=($address->id == $user->address_id || $address->id == $address_id) ? "selected='selected'" : ""?>><?=($address->company) ? $address->company : $address->getFullName()?></option>
+                  <option value="<?=$address->id?>" <?=($address->id == $user->address_id || $address->id == $user->address_id) ? "selected='selected'" : ""?>><?=($address->company) ? $address->company : $address->getFullName()?></option>
                   <?php endforeach; ?>
                 </select>
               </div>
@@ -96,7 +96,7 @@
 
               <hr />
               
-              <h4 class="card-title mb-4">Beschränkungen</h4>
+              <h4 class="card-title mb-3">Beschränkungen</h4>
               
               <div class="form-group" id="preorder-network-container">
                 <label for="preorder_networks">Preorder Netzgebiete:</label>
@@ -118,6 +118,79 @@
                 <small>Beschränkt Benutzer auf Netzgebiete. Überschreibt Netzgebiete der Firma. Wenn leer werden Netzgebiete der Firma angezeigt</small>
               </div>
               
+              <hr />
+              
+              <h4 class="card-title mb-3">Modulberechtigungen</h4>
+              
+              <div class="row">
+                <div class="col-4">
+                  <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="can[Building]" id="can_building" value="1" <?=$user->can("Building") ? "checked='checked'" : ""?> />
+                    <label for="can_building" class="form-check-label">Objekte & Anschlüsse (Gebäude)</label>
+                  </div>
+                </div>
+                <div class="col-4">
+                  <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="can[Pipework]" id="can_pipework" value="1" <?=$user->can("Pipework") ? "checked='checked'" : ""?> />
+                    <label for="can_pipework" class="form-check-label">Tiefbau</label>
+                  </div>
+                </div>
+                <div class="col-4">
+                  <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="can[Linework]" id="can_linework" value="1" <?=$user->can("Linework") ? "checked='checked'" : ""?> />
+                    <label for="can_linework" class="form-check-label">Leitungsbau</label>
+                  </div>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-4">
+                  <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="can[Patching]" id="can_patching" value="1" <?=$user->can("Patching") ? "checked='checked'" : ""?> />
+                    <label for="can_patching" class="form-check-label">Patching</label>
+                  </div>
+                </div>
+                <div class="col-4">
+                  <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="can[Filestore]" id="can_filestore" value="1" <?=$user->can("Filestore") ? "checked='checked'" : ""?> />
+                    <label for="can_filestore" class="form-check-label">Filestore (Netzbau)</label>
+                  </div>
+                </div>
+                <div class="col-4">
+                  <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="can[Cpeprovisioning]" id="can_cpeprovisioning" value="1" <?=$user->can("Cpeprovisioning") ? "checked='checked'" : ""?> />
+                    <label for="can_cpeprovisioning" class="form-check-label">CPE Provisioning</label>
+                  </div>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-4">
+                  <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="can[Cpeshipping]" id="can_cpeshipping" value="1" <?=$user->can("Cpeshipping") ? "checked='checked'" : ""?> />
+                    <label for="can_cpeshipping" class="form-check-label">CPE Versand</label>
+                  </div>
+                </div>
+                <div class="col-4">
+                  <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="can[Voipnumbering]" id="can_voipnumbering" value="1" <?=$user->can("Voipnumbering") ? "checked='checked'" : ""?> />
+                    <label for="can_voipnumbering" class="form-check-label">VOIP Nummernverwaltung</label>
+                  </div>
+                </div>
+                <div class="col-4">
+                  <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="can[Preorder]" id="can_preorder" value="1" <?=$user->can("Preorder") ? "checked='checked'" : ""?> />
+                    <label for="can_preorder" class="form-check-label">Vorbestellung</label>
+                  </div>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-4">
+                  <div class="form-group form-check">
+                    <input type="checkbox" class="form-check-input" name="can[Order]" id="can_order" value="1" <?=$user->can("Order") ? "checked='checked'" : ""?> />
+                    <label for="can_order" class="form-check-label">Bestellung</label>
+                  </div>
+                </div>
+              </div>
+              
               <div class="form-group">
                 <input type="submit" name="submit" value="Speichern" class="btn btn-primary" />
               </div>
diff --git a/application/User/UserController.php b/application/User/UserController.php
index 3ebe67781..30a311b06 100644
--- a/application/User/UserController.php
+++ b/application/User/UserController.php
@@ -1,4 +1,4 @@
-x<?php
+<?php
 
 /**
  * Description of UserController
@@ -198,20 +198,43 @@ class UserController extends mfBaseController
                 $user->permissions->preorderfront = "false";
             }
 
+            
+            
+            // set can permissions
+            $user->permissions->canBuilding = "false";
+            $user->permissions->canPipework = "false";
+            $user->permissions->canLinework = "false";
+            $user->permissions->canPatching = "false";
+            $user->permissions->canFilestore = "false";
+            $user->permissions->canCpeprovisioning = "false";
+            $user->permissions->canCpeshipping = "false";
+            $user->permissions->canVoipnumbering = "false";
+            $user->permissions->canPreorder = "false";
+            $user->permissions->canOrder = "false";
+            
+            if($r->get("can") && is_array($r->can)) {
+              foreach($r->can as $key => $can) {
+                var_dump($key . "=> ".$can);
+                if($can) {
+                  $user->permissions->{"can$key"} = "true";
+                }
+              }
+            }
+            
             $user->permissions->save();
-
+            
             // save networks
             $pn = $user->getFlag("preorder_networks");
             if (is_array($r->preorder_networks) && count($r->preorder_networks)) {
                 $pn->value(json_encode($r->preorder_networks));
                 $pn->save();
                 
-                $user->permissions->canPreorder = true;
+                $user->permissions->canPreorder = "true";
+                $user->permissions->save();
             } else {
                 $pn->delete();
             }
             
-            //XXX -  set all can permissions true
             
         }