diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 02a56544..59bfe175 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -509,352 +509,391 @@
                           "
                         ></gz-tag-picker>
                       </v-col>
-                      <v-col cols="12">
-                        <span class="text-subtitle-1">
-                          {{ $ay.t("CustomerAccessWorkOrderReport") }}
-                        </span>
-                      </v-col>
-                      <v-col cols="12">
-                        <gz-pick-list
-                          :aya-type="ayaTypes().Report"
-                          :variant="ayaTypes().WorkOrder.toString()"
-                          show-edit-icon
-                          v-model="obj.customerDefaultWorkOrderReportId"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('DefaultReport')"
-                          ref="customerDefaultWorkOrderReportId"
-                          data-cy="customerDefaultWorkOrderReportId"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerDefaultWorkOrderReportId'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged(
-                              'customerDefaultWorkOrderReportId'
-                            )
-                          "
-                        ></gz-pick-list>
-                      </v-col>
+                      <v-expansion-panels>
+                        <v-expansion-panel key="a">
+                          <v-expansion-panel-header>
+                            <span class="text-subtitle-1">
+                              {{ $ay.t("CustomerAccessWorkOrderReport") }}
+                            </span>
+                          </v-expansion-panel-header>
+                          <v-expansion-panel-content>
+                            <v-row>
+                              <v-col cols="12">
+                                <gz-pick-list
+                                  :aya-type="ayaTypes().Report"
+                                  :variant="ayaTypes().WorkOrder.toString()"
+                                  show-edit-icon
+                                  v-model="obj.customerDefaultWorkOrderReportId"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('DefaultReport')"
+                                  ref="customerDefaultWorkOrderReportId"
+                                  data-cy="customerDefaultWorkOrderReportId"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerDefaultWorkOrderReportId'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerDefaultWorkOrderReportId'
+                                    )
+                                  "
+                                ></gz-pick-list>
+                              </v-col>
 
-                      <!-- ------------ -->
-                      <v-col cols="12" sm="6">
-                        <gz-tag-picker
-                          v-model="obj.customerWorkOrderReport1Tags"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('WorkOrderCustomerTaggedWith')"
-                          ref="customerWorkOrderReport1Tags"
-                          data-cy="customerWorkOrderReport1Tags"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerWorkOrderReport1Tags'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerWorkOrderReport1Tags')
-                          "
-                        ></gz-tag-picker>
-                      </v-col>
+                              <!-- ------------ -->
+                              <v-col cols="12" sm="6">
+                                <gz-tag-picker
+                                  v-model="obj.customerWorkOrderReport1Tags"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('WorkOrderCustomerTaggedWith')"
+                                  ref="customerWorkOrderReport1Tags"
+                                  data-cy="customerWorkOrderReport1Tags"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerWorkOrderReport1Tags'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerWorkOrderReport1Tags'
+                                    )
+                                  "
+                                ></gz-tag-picker>
+                              </v-col>
 
-                      <v-col cols="12" sm="6">
-                        <gz-pick-list
-                          :aya-type="ayaTypes().Report"
-                          :variant="ayaTypes().WorkOrder.toString()"
-                          show-edit-icon
-                          v-model="obj.customerTagWorkOrderReport1Id"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('DefaultReport')"
-                          ref="customerTagWorkOrderReport1Id"
-                          data-cy="customerTagWorkOrderReport1Id"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerTagWorkOrderReport1Id'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerTagWorkOrderReport1Id')
-                          "
-                        ></gz-pick-list>
-                      </v-col>
+                              <v-col cols="12" sm="6">
+                                <gz-pick-list
+                                  :aya-type="ayaTypes().Report"
+                                  :variant="ayaTypes().WorkOrder.toString()"
+                                  show-edit-icon
+                                  v-model="obj.customerTagWorkOrderReport1Id"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('DefaultReport')"
+                                  ref="customerTagWorkOrderReport1Id"
+                                  data-cy="customerTagWorkOrderReport1Id"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerTagWorkOrderReport1Id'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerTagWorkOrderReport1Id'
+                                    )
+                                  "
+                                ></gz-pick-list>
+                              </v-col>
 
-                      <!-- ------------ -->
-                      <v-col cols="12" sm="6">
-                        <gz-tag-picker
-                          v-model="obj.customerWorkOrderReport2Tags"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('WorkOrderCustomerTaggedWith')"
-                          ref="customerWorkOrderReport2Tags"
-                          data-cy="customerWorkOrderReport2Tags"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerWorkOrderReport2Tags'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerWorkOrderReport2Tags')
-                          "
-                        ></gz-tag-picker>
-                      </v-col>
+                              <!-- ------------ -->
+                              <v-col cols="12" sm="6">
+                                <gz-tag-picker
+                                  v-model="obj.customerWorkOrderReport2Tags"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('WorkOrderCustomerTaggedWith')"
+                                  ref="customerWorkOrderReport2Tags"
+                                  data-cy="customerWorkOrderReport2Tags"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerWorkOrderReport2Tags'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerWorkOrderReport2Tags'
+                                    )
+                                  "
+                                ></gz-tag-picker>
+                              </v-col>
 
-                      <v-col cols="12" sm="6">
-                        <gz-pick-list
-                          :aya-type="ayaTypes().Report"
-                          :variant="ayaTypes().WorkOrder.toString()"
-                          show-edit-icon
-                          v-model="obj.customerTagWorkOrderReport2Id"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('DefaultReport')"
-                          ref="customerTagWorkOrderReport2Id"
-                          data-cy="customerTagWorkOrderReport2Id"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerTagWorkOrderReport2Id'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerTagWorkOrderReport2Id')
-                          "
-                        ></gz-pick-list>
-                      </v-col>
+                              <v-col cols="12" sm="6">
+                                <gz-pick-list
+                                  :aya-type="ayaTypes().Report"
+                                  :variant="ayaTypes().WorkOrder.toString()"
+                                  show-edit-icon
+                                  v-model="obj.customerTagWorkOrderReport2Id"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('DefaultReport')"
+                                  ref="customerTagWorkOrderReport2Id"
+                                  data-cy="customerTagWorkOrderReport2Id"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerTagWorkOrderReport2Id'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerTagWorkOrderReport2Id'
+                                    )
+                                  "
+                                ></gz-pick-list>
+                              </v-col>
 
-                      <!-- ------------ -->
-                      <v-col cols="12" sm="6">
-                        <gz-tag-picker
-                          v-model="obj.customerWorkOrderReport3Tags"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('WorkOrderCustomerTaggedWith')"
-                          ref="customerWorkOrderReport3Tags"
-                          data-cy="customerWorkOrderReport3Tags"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerWorkOrderReport3Tags'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerWorkOrderReport3Tags')
-                          "
-                        ></gz-tag-picker>
-                      </v-col>
+                              <!-- ------------ -->
+                              <v-col cols="12" sm="6">
+                                <gz-tag-picker
+                                  v-model="obj.customerWorkOrderReport3Tags"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('WorkOrderCustomerTaggedWith')"
+                                  ref="customerWorkOrderReport3Tags"
+                                  data-cy="customerWorkOrderReport3Tags"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerWorkOrderReport3Tags'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerWorkOrderReport3Tags'
+                                    )
+                                  "
+                                ></gz-tag-picker>
+                              </v-col>
 
-                      <v-col cols="12" sm="6">
-                        <gz-pick-list
-                          :aya-type="ayaTypes().Report"
-                          :variant="ayaTypes().WorkOrder.toString()"
-                          show-edit-icon
-                          v-model="obj.customerTagWorkOrderReport3Id"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('DefaultReport')"
-                          ref="customerTagWorkOrderReport3Id"
-                          data-cy="customerTagWorkOrderReport3Id"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerTagWorkOrderReport3Id'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerTagWorkOrderReport3Id')
-                          "
-                        ></gz-pick-list>
-                      </v-col>
+                              <v-col cols="12" sm="6">
+                                <gz-pick-list
+                                  :aya-type="ayaTypes().Report"
+                                  :variant="ayaTypes().WorkOrder.toString()"
+                                  show-edit-icon
+                                  v-model="obj.customerTagWorkOrderReport3Id"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('DefaultReport')"
+                                  ref="customerTagWorkOrderReport3Id"
+                                  data-cy="customerTagWorkOrderReport3Id"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerTagWorkOrderReport3Id'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerTagWorkOrderReport3Id'
+                                    )
+                                  "
+                                ></gz-pick-list>
+                              </v-col>
 
-                      <!-- ------------ -->
-                      <v-col cols="12" sm="6">
-                        <gz-tag-picker
-                          v-model="obj.customerWorkOrderReport4Tags"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('WorkOrderCustomerTaggedWith')"
-                          ref="customerWorkOrderReport4Tags"
-                          data-cy="customerWorkOrderReport4Tags"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerWorkOrderReport4Tags'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerWorkOrderReport4Tags')
-                          "
-                        ></gz-tag-picker>
-                      </v-col>
+                              <!-- ------------ -->
+                              <v-col cols="12" sm="6">
+                                <gz-tag-picker
+                                  v-model="obj.customerWorkOrderReport4Tags"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('WorkOrderCustomerTaggedWith')"
+                                  ref="customerWorkOrderReport4Tags"
+                                  data-cy="customerWorkOrderReport4Tags"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerWorkOrderReport4Tags'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerWorkOrderReport4Tags'
+                                    )
+                                  "
+                                ></gz-tag-picker>
+                              </v-col>
 
-                      <v-col cols="12" sm="6">
-                        <gz-pick-list
-                          :aya-type="ayaTypes().Report"
-                          :variant="ayaTypes().WorkOrder.toString()"
-                          show-edit-icon
-                          v-model="obj.customerTagWorkOrderReport4Id"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('DefaultReport')"
-                          ref="customerTagWorkOrderReport4Id"
-                          data-cy="customerTagWorkOrderReport4Id"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerTagWorkOrderReport4Id'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerTagWorkOrderReport4Id')
-                          "
-                        ></gz-pick-list>
-                      </v-col>
+                              <v-col cols="12" sm="6">
+                                <gz-pick-list
+                                  :aya-type="ayaTypes().Report"
+                                  :variant="ayaTypes().WorkOrder.toString()"
+                                  show-edit-icon
+                                  v-model="obj.customerTagWorkOrderReport4Id"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('DefaultReport')"
+                                  ref="customerTagWorkOrderReport4Id"
+                                  data-cy="customerTagWorkOrderReport4Id"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerTagWorkOrderReport4Id'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerTagWorkOrderReport4Id'
+                                    )
+                                  "
+                                ></gz-pick-list>
+                              </v-col>
 
-                      <!-- ------------ -->
-                      <v-col cols="12" sm="6">
-                        <gz-tag-picker
-                          v-model="obj.customerWorkOrderReport5Tags"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('WorkOrderCustomerTaggedWith')"
-                          ref="customerWorkOrderReport5Tags"
-                          data-cy="customerWorkOrderReport5Tags"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerWorkOrderReport5Tags'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerWorkOrderReport5Tags')
-                          "
-                        ></gz-tag-picker>
-                      </v-col>
+                              <!-- ------------ -->
+                              <v-col cols="12" sm="6">
+                                <gz-tag-picker
+                                  v-model="obj.customerWorkOrderReport5Tags"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('WorkOrderCustomerTaggedWith')"
+                                  ref="customerWorkOrderReport5Tags"
+                                  data-cy="customerWorkOrderReport5Tags"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerWorkOrderReport5Tags'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerWorkOrderReport5Tags'
+                                    )
+                                  "
+                                ></gz-tag-picker>
+                              </v-col>
 
-                      <v-col cols="12" sm="6">
-                        <gz-pick-list
-                          :aya-type="ayaTypes().Report"
-                          :variant="ayaTypes().WorkOrder.toString()"
-                          show-edit-icon
-                          v-model="obj.customerTagWorkOrderReport5Id"
-                          :readonly="formState.readOnly"
-                          :label="$ay.t('DefaultReport')"
-                          ref="customerTagWorkOrderReport5Id"
-                          data-cy="customerTagWorkOrderReport5Id"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerTagWorkOrderReport5Id'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerTagWorkOrderReport5Id')
-                          "
-                        ></gz-pick-list>
-                      </v-col>
+                              <v-col cols="12" sm="6">
+                                <gz-pick-list
+                                  :aya-type="ayaTypes().Report"
+                                  :variant="ayaTypes().WorkOrder.toString()"
+                                  show-edit-icon
+                                  v-model="obj.customerTagWorkOrderReport5Id"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('DefaultReport')"
+                                  ref="customerTagWorkOrderReport5Id"
+                                  data-cy="customerTagWorkOrderReport5Id"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerTagWorkOrderReport5Id'
+                                    )
+                                  "
+                                  @input="
+                                    fieldValueChanged(
+                                      'customerTagWorkOrderReport5Id'
+                                    )
+                                  "
+                                ></gz-pick-list>
+                              </v-col>
+                            </v-row>
+                          </v-expansion-panel-content>
+                        </v-expansion-panel>
+                        <v-expansion-panel key="b">
+                          <v-expansion-panel-header>
+                            <span class="text-subtitle-1">
+                              {{ $ay.t("CustomerAccessWorkOrderWiki") }}
+                            </span>
+                          </v-expansion-panel-header>
+                          <v-expansion-panel-content>
+                            <v-row>
+                              <v-col cols="12" sm="6" lg="2">
+                                <v-checkbox
+                                  v-model="obj.customerAllowWOWiki"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('Active')"
+                                  ref="customerAllowWOWiki"
+                                  data-cy="customerAllowWOWiki"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerAllowWOWiki'
+                                    )
+                                  "
+                                  @change="
+                                    fieldValueChanged('customerAllowWOWiki')
+                                  "
+                                ></v-checkbox>
+                              </v-col>
+                              <template v-if="obj.customerAllowWOWiki">
+                                <v-col cols="12" sm="6" lg="10">
+                                  <gz-tag-picker
+                                    v-model="obj.customerAllowWOWikiInTags"
+                                    :readonly="formState.readOnly"
+                                    :label="
+                                      $ay.t(
+                                        'WorkOrderContactCustomerHeadOfficeTaggedWith'
+                                      )
+                                    "
+                                    ref="customerAllowWOWikiInTags"
+                                    data-cy="customerAllowWOWikiInTags"
+                                    :error-messages="
+                                      form().serverErrors(
+                                        this,
+                                        'customerAllowWOWikiInTags'
+                                      )
+                                    "
+                                    @input="
+                                      fieldValueChanged(
+                                        'customerAllowWOWikiInTags'
+                                      )
+                                    "
+                                  ></gz-tag-picker>
+                                </v-col>
+                              </template>
+                            </v-row>
+                          </v-expansion-panel-content>
+                        </v-expansion-panel>
+                        <v-expansion-panel key="c">
+                          <v-expansion-panel-header>
+                            <span class="text-subtitle-1">
+                              {{ $ay.t("CustomerAccessWorkOrderAttachments") }}
+                            </span>
+                          </v-expansion-panel-header>
+                          <v-expansion-panel-content>
+                            <v-row>
+                              <v-col cols="12" sm="6" lg="2">
+                                <v-checkbox
+                                  v-model="obj.customerAllowWOAttachments"
+                                  :readonly="formState.readOnly"
+                                  :label="$ay.t('Active')"
+                                  ref="customerAllowWOAttachments"
+                                  data-cy="customerAllowWOAttachments"
+                                  :error-messages="
+                                    form().serverErrors(
+                                      this,
+                                      'customerAllowWOAttachments'
+                                    )
+                                  "
+                                  @change="
+                                    fieldValueChanged(
+                                      'customerAllowWOAttachments'
+                                    )
+                                  "
+                                ></v-checkbox>
+                              </v-col>
+                              <template v-if="obj.customerAllowWOAttachments">
+                                <v-col cols="12" sm="6" lg="10">
+                                  <gz-tag-picker
+                                    v-model="
+                                      obj.customerAllowWOAttachmentsInTags
+                                    "
+                                    :readonly="formState.readOnly"
+                                    :label="
+                                      $ay.t(
+                                        'WorkOrderContactCustomerHeadOfficeTaggedWith'
+                                      )
+                                    "
+                                    ref="customerAllowWOAttachmentsInTags"
+                                    data-cy="customerAllowWOAttachmentsInTags"
+                                    :error-messages="
+                                      form().serverErrors(
+                                        this,
+                                        'customerAllowWOAttachmentsInTags'
+                                      )
+                                    "
+                                    @input="
+                                      fieldValueChanged(
+                                        'customerAllowWOAttachmentsInTags'
+                                      )
+                                    "
+                                  ></gz-tag-picker>
+                                </v-col>
+                              </template>
+                            </v-row>
+                          </v-expansion-panel-content>
+                        </v-expansion-panel>
+                      </v-expansion-panels>
                     </template>
                   </v-row>
                 </v-expansion-panel-content>
               </v-expansion-panel>
               <v-expansion-panel key="3">
-                <v-expansion-panel-header>
-                  <span class="text-h6">
-                    {{ $ay.t("CustomerAccessWorkOrderWiki") }}
-                  </span>
-                </v-expansion-panel-header>
-                <v-expansion-panel-content>
-                  <v-row>
-                    <v-col cols="12" sm="6" lg="2">
-                      <v-checkbox
-                        v-model="obj.customerAllowWOWiki"
-                        :readonly="formState.readOnly"
-                        :label="$ay.t('Active')"
-                        ref="customerAllowWOWiki"
-                        data-cy="customerAllowWOWiki"
-                        :error-messages="
-                          form().serverErrors(this, 'customerAllowWOWiki')
-                        "
-                        @change="fieldValueChanged('customerAllowWOWiki')"
-                      ></v-checkbox>
-                    </v-col>
-                    <template v-if="obj.customerAllowWOWiki">
-                      <v-col cols="12" sm="6" lg="10">
-                        <gz-tag-picker
-                          v-model="obj.customerAllowWOWikiInTags"
-                          :readonly="formState.readOnly"
-                          :label="
-                            $ay.t(
-                              'WorkOrderContactCustomerHeadOfficeTaggedWith'
-                            )
-                          "
-                          ref="customerAllowWOWikiInTags"
-                          data-cy="customerAllowWOWikiInTags"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerAllowWOWikiInTags'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged('customerAllowWOWikiInTags')
-                          "
-                        ></gz-tag-picker>
-                      </v-col>
-                    </template>
-                  </v-row>
-                </v-expansion-panel-content>
-              </v-expansion-panel>
-              <v-expansion-panel key="4">
-                <v-expansion-panel-header>
-                  <span class="text-h6">
-                    {{ $ay.t("CustomerAccessWorkOrderAttachments") }}
-                  </span>
-                </v-expansion-panel-header>
-                <v-expansion-panel-content>
-                  <v-row>
-                    <v-col cols="12" sm="6" lg="2">
-                      <v-checkbox
-                        v-model="obj.customerAllowWOAttachments"
-                        :readonly="formState.readOnly"
-                        :label="$ay.t('Active')"
-                        ref="customerAllowWOAttachments"
-                        data-cy="customerAllowWOAttachments"
-                        :error-messages="
-                          form().serverErrors(
-                            this,
-                            'customerAllowWOAttachments'
-                          )
-                        "
-                        @change="
-                          fieldValueChanged('customerAllowWOAttachments')
-                        "
-                      ></v-checkbox>
-                    </v-col>
-                    <template v-if="obj.customerAllowWOAttachments">
-                      <v-col cols="12" sm="6" lg="10">
-                        <gz-tag-picker
-                          v-model="obj.customerAllowWOAttachmentsInTags"
-                          :readonly="formState.readOnly"
-                          :label="
-                            $ay.t(
-                              'WorkOrderContactCustomerHeadOfficeTaggedWith'
-                            )
-                          "
-                          ref="customerAllowWOAttachmentsInTags"
-                          data-cy="customerAllowWOAttachmentsInTags"
-                          :error-messages="
-                            form().serverErrors(
-                              this,
-                              'customerAllowWOAttachmentsInTags'
-                            )
-                          "
-                          @input="
-                            fieldValueChanged(
-                              'customerAllowWOAttachmentsInTags'
-                            )
-                          "
-                        ></gz-tag-picker>
-                      </v-col>
-                    </template>
-                  </v-row>
-                </v-expansion-panel-content>
-              </v-expansion-panel>
-              <v-expansion-panel key="5">
                 <v-expansion-panel-header>
                   <span class="text-h6">
                     {{ $ay.t("UserSettings") }}
@@ -898,7 +937,7 @@
                   </v-row>
                 </v-expansion-panel-content>
               </v-expansion-panel>
-              <v-expansion-panel key="6">
+              <v-expansion-panel key="4">
                 <v-expansion-panel-header>
                   <span class="text-h6">
                     {{ $ay.t("NotifySubscriptionList") }}