diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue
index 7470f7edc..aeaac9d82 100644
--- a/src/modules/17_acting/views/main.vue
+++ b/src/modules/17_acting/views/main.vue
@@ -317,7 +317,7 @@ onMounted(() => {
     <q-space />
     <q-btn
       class="q-px-sm"
-      v-if="storeActing.isOfficer === true"
+      v-if="storeActing.isOfficer || storeActing.isStaff"
       dense
       flat
       round
diff --git a/src/modules/18_command/components/DialogCreateCommandORG.vue b/src/modules/18_command/components/DialogCreateCommandORG.vue
index 621cc9e69..7329fac3d 100644
--- a/src/modules/18_command/components/DialogCreateCommandORG.vue
+++ b/src/modules/18_command/components/DialogCreateCommandORG.vue
@@ -206,7 +206,6 @@ async function fetchCommandType() {
  */
 function filterOption(val: string, update: Function) {
   update(() => {
-    group.value = val ? "" : group.value;
     groupOp.value = groupDataOp.value.filter(
       (v: DataOption) => v.name.indexOf(val) > -1
     );
@@ -487,12 +486,14 @@ watch(modal, async () => {
                 option-label="name"
                 :options="groupOp"
                 option-value="id"
-                class="inputgreen"
+                :class="isStaff ? '' : 'inputgreen'"
                 dense
                 :readonly="isStaff"
                 emit-value
                 map-options
                 use-input
+                hide-selected
+                fill-input
                 outlined
                 @update:model-value="updateValue"
                 @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "