diff --git a/Layout/default/Device/Form.php b/Layout/default/Device/Form.php
index 9f5c7860c..faa302a76 100644
--- a/Layout/default/Device/Form.php
+++ b/Layout/default/Device/Form.php
@@ -70,14 +70,14 @@ asort($Devices);
                                     <label class="col-lg-2 col-form-label" for="name">Name *</label>
                                     <div class="col-lg-10">
                                         <input type="text" class="form-control" name="name" id="name"
-                                               value="<?= $device->name ?>">
+                                               value="<?= $device->name ?>" required="required" >
                                     </div>
                                 </div>
                                 <div class="form-group row">
                                     <label class="col-lg-2 col-form-label" for="devicetype_id">Gerätetyp *</label>
                                     <div class="col-lg-10">
-                                        <select class="select2 form-control " name="devicetype_id" id="devicetype_id">
-                                            <option>&nbsp;</option>
+                                        <select class="select2 form-control " name="devicetype_id" id="devicetype_id" required="required" >
+                                            <option value="">&nbsp;</option>
                                             <?php foreach ($deviceTypes as $key => $devicetype): ?>
                                                 <option value="<?= $key ?>" <?= ($device->devicetype_id == $key) ? "selected='selected'" : "" ?>><?= ($devicetype) ?></option>
                                             <?php endforeach; ?>
@@ -166,7 +166,7 @@ asort($Devices);
                                 <div class="form-group row">
                                     <label class="col-lg-2 col-form-label" for="ip">IP-Adresse *</label>
                                     <div class="col-lg-10">
-                                        <input type="text" class="form-control" name="ip" id="ip" placeholder="10.0.0.1"
+                                        <input required="required" type="text" class="form-control" name="ip" id="ip" placeholder="10.0.0.1"
                                                value="<?= $device->ip ?>">
                                     </div>
                                 </div>