diff --git a/src/forms/form_dynamic_add.php b/src/forms/form_dynamic_add.php
index fb975b5..19e9ea8 100644
--- a/src/forms/form_dynamic_add.php
+++ b/src/forms/form_dynamic_add.php
@@ -117,15 +117,7 @@
     </div>
     
 <div class="col-sm-12 mb-2">
-  <div class="row">    
-    <div class="col-sm-4">
-        <div class="form-group">
-            <label for="filename">Filename *</label>
-            <input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id="filename">
-          
-        </div>
-    </div>
-    
+  <div class="row">
     <div class="col-6 col-md-1">
                 <label for="format">Format *</label>
                 <select name="format" class="form-control" required="required">
@@ -177,13 +169,20 @@
   </div>
 </div>
 
-    <?php if($_SESSION['type'] ===  'super') { ?>
     <div class="col-sm-12 mb-2">
         <div class="row">
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label for="filename">Filename *</label>
+                    <input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id="filename">
+                </div>
+            </div>
+
+            <?php if ($_SESSION['type'] === 'super') { ?>
             <div class="col-sm-4">
                 <div class="form-group">
                     <label for="id_owner">Owner *</label>
-                    <select name="id_owner" class="form-control">
+                    <select name="id_owner" id="id_owner" class="form-control">
                         <option value="">All (shared with every admin)</option>
                         <?php
 
@@ -199,9 +198,9 @@
                     </select>
                 </div>
             </div>
+            <?php } else { ?>
+            <input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
+            <?php } ?>
         </div>
     </div>
-    <?php } else { ?>
-        <input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
-    <?php } ?>
 </fieldset>
diff --git a/src/forms/qrcode_options.php b/src/forms/qrcode_options.php
index 7c69790..979e77e 100644
--- a/src/forms/qrcode_options.php
+++ b/src/forms/qrcode_options.php
@@ -113,15 +113,7 @@ if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
     -->
 
 <div class="col-sm-12 mb-2">
-  <div class="row">    
-    <div class="col-sm-4">
-        <div class="form-group">
-            <label for="filename">Filename *</label>
-            <input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id = "filename">
-          
-        </div>
-    </div>
-    
+  <div class="row">
     <div class="col-6 col-md-1">
                 <label for="format">Format</label>
                 <select name="format" class="form-control">
@@ -178,31 +170,38 @@ if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
   </div>
 </div>
 
-<?php if($_SESSION['type'] ===  'super') { ?>
-    <div class="col-sm-12 mb-2">
-        <div class="row">
-            <div class="col-sm-4">
-                <div class="form-group">
-                    <label for="id_owner">Owner *</label>
-                    <select name="id_owner" class="form-control">
-                        <option value="">All (shared with every admin)</option>
-                        <?php
-
-                        require_once BASE_PATH . '/lib/Users/Users.php';
-                        $users_instance = new Users();
-                        $users = $users_instance->getAllUsers();
-
-                        foreach ($users as $user) {
-                            $is_self = (int) $user["id"] === (int) $_SESSION["user_id"];
-                            ?>
-                            <option value="<?php echo $user["id"];?>" <?php echo $is_self ? 'selected' : ''; ?>><?php echo $user["username"];?></option>
-                        <?php } ?>
-                    </select>
-                </div>
+<div class="col-sm-12 mb-2">
+    <div class="row">
+        <div class="col-sm-4">
+            <div class="form-group">
+                <label for="filename">Filename *</label>
+                <input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id="filename">
             </div>
         </div>
+
+        <?php if ($_SESSION['type'] === 'super') { ?>
+        <div class="col-sm-4">
+            <div class="form-group">
+                <label for="id_owner">Owner *</label>
+                <select name="id_owner" id="id_owner" class="form-control">
+                    <option value="">All (shared with every admin)</option>
+                    <?php
+
+                    require_once BASE_PATH . '/lib/Users/Users.php';
+                    $users_instance = new Users();
+                    $users = $users_instance->getAllUsers();
+
+                    foreach ($users as $user) {
+                        $is_self = (int) $user["id"] === (int) $_SESSION["user_id"];
+                        ?>
+                        <option value="<?php echo $user["id"];?>" <?php echo $is_self ? 'selected' : ''; ?>><?php echo $user["username"];?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+        <?php } else { ?>
+        <input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
+        <?php } ?>
     </div>
-<?php } else { ?>
-    <input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
-<?php } ?>
+</div>
     <br>