diff --git a/groups.php b/groups.php
index 3ed4d1658..6e57b375d 100644
--- a/groups.php
+++ b/groups.php
@@ -266,7 +266,7 @@ function edit_group(id) {
             $('#editName').prop("value", group['name']);
             for (var i = 0; i < cnt; i++) {
                 console.log('Selected user: ' + selectedUsers[i]);
-                $('#editUsers option[value=' + selectedUsers[i] + ']').attr('selected',true).change();
+                $('#editUsers option[value="' + selectedUsers[i] + '"]').attr('selected',true).change();
             }
 
         }
diff --git a/user_mgmt.php b/user_mgmt.php
index 110eaae08..2d35ffaba 100644
--- a/user_mgmt.php
+++ b/user_mgmt.php
@@ -123,10 +123,12 @@
                         <label class="col-5" for="editEnabled"><?php etranslate('Enabled') ?>: </label>
                         <?php echo print_radio('editEnabled'); ?>
                     </div>
+                    <?php if ($is_admin) { ?>
                     <div class="form-inline mt-1 mb-2" id="div-editIsAdmin">
                         <label class="col-5" for="editIsAdmin"><?php etranslate('Admin') ?>: </label>
                         <?php echo print_radio('editIsAdmin'); ?>
                     </div>
+                    <?php } ?>
 
                     <div class="modal-footer">
                       <button class="btn btn-secondary" data-dismiss="modal"