diff --git a/Koha/SIP2/Object.pm b/Koha/SIP2/Object.pm
index 860cf6aa2f..c142df073f 100644
--- a/Koha/SIP2/Object.pm
+++ b/Koha/SIP2/Object.pm
@@ -57,13 +57,15 @@ sub delete {
     return $self->SUPER::delete;
 }
 
-# sub _update_config_timestamp {
-#     my $timestamp = DateTime->now;
+sub _update_config_timestamp {
+    return 1;
 
-#     my $config_timestamp = Koha::SIP2::ServerParams->find( { key => 'config_timestamp' } )
-#         || Koha::SIP2::ServerParam->new( { key => 'config_timestamp' } );
-#     $config_timestamp->value( DateTime->now->epoch )->store;
-# }
+    # my $timestamp = DateTime->now;
+
+    # my $config_timestamp = Koha::SIP2::ServerParams->find( { key => 'config_timestamp' } )
+    #     || Koha::SIP2::ServerParam->new( { key => 'config_timestamp' } );
+    # $config_timestamp->value( DateTime->now->epoch )->store;
+}
 
 1;
 
diff --git a/api/v1/swagger/paths/sip2_accounts.yaml b/api/v1/swagger/paths/sip2_accounts.yaml
index d9f0250191..8c785f22b9 100644
--- a/api/v1/swagger/paths/sip2_accounts.yaml
+++ b/api/v1/swagger/paths/sip2_accounts.yaml
@@ -147,6 +147,7 @@
         items:
           type: string
           enum:
+            - institution
             - custom_item_fields
             - item_fields
             - custom_patron_fields
diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/cash-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/cash-api-client.js
index 80b3ee0b5f..9f47159454 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/fetch/cash-api-client.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/cash-api-client.js
@@ -1,4 +1,4 @@
-export class CataloguingAPIClient {
+export class CashAPIClient {
     constructor(HttpClient) {
         this.httpClient = new HttpClient({
             baseURL: "/api/v1/",
@@ -8,7 +8,7 @@ export class CataloguingAPIClient {
     get cash_registers() {
         return {
             getAll: (query, params, headers) =>
-                this.getAll({
+                this.httpClient.getAll({
                     endpoint: "cash_registers",
                     query,
                     params,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/item-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/item-api-client.js
index 5fd210e5b8..c4a31f0fed 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/fetch/item-api-client.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/item-api-client.js
@@ -20,7 +20,7 @@ export class ItemAPIClient {
     get item_types() {
         return {
             getAll: (query, params, headers) =>
-                this.getAll({
+                this.httpClient.getAll({
                     endpoint: "item_types",
                     query,
                     params,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/patron-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/patron-api-client.js
index c2760a8466..4ddaed0cfc 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/fetch/patron-api-client.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/patron-api-client.js
@@ -1,7 +1,7 @@
 export class PatronAPIClient {
     constructor(HttpClient) {
         this.httpClient = new HttpClient({
-            baseURL: "/api/v1/patrons/",
+            baseURL: "/api/v1/",
         });
     }
 
@@ -9,15 +9,15 @@ export class PatronAPIClient {
         return {
             get: id =>
                 this.httpClient.get({
-                    endpoint: id,
+                    endpoint: "patrons/" + id,
                 }),
         };
     }
 
-    get patron_categories() {
+    get categories() {
         return {
             getAll: (query, params, headers) =>
-                this.getAll({
+                this.httpClient.getAll({
                     endpoint: "patron_categories",
                     query,
                     params,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/sip2-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/sip2-api-client.js
index 3d0711c452..2950f81c86 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/fetch/sip2-api-client.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/sip2-api-client.js
@@ -8,29 +8,29 @@ export class SIP2APIClient {
     get institutions() {
         return {
             get: id =>
-                this.get({
+                this.httpClient.get({
                     endpoint: "institutions/" + id,
                 }),
             getAll: params =>
-                this.getAll({
+                this.httpClient.getAll({
                     endpoint: "institutions",
                 }),
             delete: id =>
-                this.delete({
+                this.httpClient.delete({
                     endpoint: "institutions/" + id,
                 }),
             create: institution =>
-                this.post({
+                this.httpClient.post({
                     endpoint: "institutions",
                     body: institution,
                 }),
             update: (institution, id) =>
-                this.put({
+                this.httpClient.put({
                     endpoint: "institutions/" + id,
                     body: institution,
                 }),
             count: (query = {}) =>
-                this.count({
+                this.httpClient.count({
                     endpoint:
                         "institutions?" +
                         new URLSearchParams({
@@ -45,33 +45,33 @@ export class SIP2APIClient {
     get accounts() {
         return {
             get: id =>
-                this.get({
+                this.httpClient.get({
                     endpoint: "accounts/" + id,
                     headers: {
                         "x-koha-embed":
-                            "custom_item_fields,item_fields,custom_patron_fields,patron_attributes,screen_msg_regexs,sort_bin_mappings,system_preference_overrides",
+                            "institution,custom_item_fields,item_fields,custom_patron_fields,patron_attributes,screen_msg_regexs,sort_bin_mappings,system_preference_overrides",
                     },
                 }),
             getAll: params =>
-                this.getAll({
+                this.httpClient.getAll({
                     endpoint: "accounts",
                 }),
             delete: id =>
-                this.delete({
+                this.httpClient.delete({
                     endpoint: "accounts/" + id,
                 }),
             create: account =>
-                this.post({
+                this.httpClient.post({
                     endpoint: "accounts",
                     body: account,
                 }),
             update: (account, id) =>
-                this.put({
+                this.httpClient.put({
                     endpoint: "accounts/" + id,
                     body: account,
                 }),
             count: (query = {}) =>
-                this.count({
+                this.httpClient.count({
                     endpoint:
                         "accounts?" +
                         new URLSearchParams({
@@ -86,29 +86,29 @@ export class SIP2APIClient {
     get listeners() {
         return {
             get: id =>
-                this.get({
+                this.httpClient.get({
                     endpoint: "listeners/" + id,
                 }),
             getAll: params =>
-                this.getAll({
+                this.httpClient.getAll({
                     endpoint: "listeners",
                 }),
             delete: id =>
-                this.delete({
+                this.httpClient.delete({
                     endpoint: "listeners/" + id,
                 }),
             create: listener =>
-                this.post({
+                this.httpClient.post({
                     endpoint: "listeners",
                     body: listener,
                 }),
             update: (listener, id) =>
-                this.put({
+                this.httpClient.put({
                     endpoint: "listeners/" + id,
                     body: listener,
                 }),
             count: (query = {}) =>
-                this.count({
+                this.httpClient.count({
                     endpoint:
                         "listeners?" +
                         new URLSearchParams({
@@ -123,11 +123,11 @@ export class SIP2APIClient {
     get serverparams() {
         return {
             getAll: params =>
-                this.getAll({
+                this.httpClient.getAll({
                     endpoint: "serverparams",
                 }),
             updateAll: body =>
-                this.patch({
+                this.httpClient.patch({
                     endpoint: "serverparams",
                     body: body,
                 }),
@@ -137,29 +137,29 @@ export class SIP2APIClient {
     get system_preference_overrides() {
         return {
             get: id =>
-                this.get({
+                this.httpClient.get({
                     endpoint: "system_preference_overrides/" + id,
                 }),
             getAll: params =>
-                this.getAll({
+                this.httpClient.getAll({
                     endpoint: "system_preference_overrides",
                 }),
             delete: id =>
-                this.delete({
+                this.httpClient.delete({
                     endpoint: "system_preference_overrides/" + id,
                 }),
             create: system_preference_override =>
-                this.post({
+                this.httpClient.post({
                     endpoint: "system_preference_overrides",
                     body: system_preference_override,
                 }),
             update: (system_preference_override, id) =>
-                this.put({
+                this.httpClient.put({
                     endpoint: "system_preference_overrides/" + id,
                     body: system_preference_override,
                 }),
             count: (query = {}) =>
-                this.count({
+                this.httpClient.count({
                     endpoint:
                         "system_preference_overrides?" +
                         new URLSearchParams({
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/Main.vue
index a654d47172..271c33715e 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/Main.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/Main.vue
@@ -21,9 +21,9 @@
 </template>
 
 <script>
-import { inject } from "vue";
-import { APIClient } from "../../fetch/api-client.js";
+import { inject, onBeforeMount, ref } from "vue";
 import Breadcrumbs from "../Breadcrumbs.vue";
+import { storeToRefs } from "pinia";
 import Help from "../Help.vue";
 import LeftMenu from "../LeftMenu.vue";
 import Dialog from "../Dialog.vue";
@@ -31,44 +31,27 @@ import "vue-select/dist/vue-select.css";
 
 export default {
     setup() {
-        const AVStore = inject("AVStore");
+        const SIP2Store = inject("SIP2Store");
+        const { authorisedValues } = storeToRefs(SIP2Store);
+        const { loadAuthorisedValues } = SIP2Store;
 
-        return {
-            AVStore,
-        };
-    },
-    data() {
-        return {
-            initialized: false,
-        };
-    },
-    beforeCreate() {
-        const av_client = APIClient.authorised_values;
-        const authorised_values = {
-            av_lost: "LOST",
-        };
+        const mainStore = inject("mainStore");
 
-        let av_cat_array = Object.keys(authorised_values).map(
-            function (av_cat) {
-                return '"' + authorised_values[av_cat] + '"';
-            }
-        );
+        const { loading, loaded, setError } = mainStore;
 
-        av_client.values
-            .getCategoriesWithValues(av_cat_array)
-            .then(av_categories => {
-                Object.entries(authorised_values).forEach(
-                    ([av_var, av_cat]) => {
-                        const av_match = av_categories.find(
-                            element => element.category_name == av_cat
-                        );
-                        this.AVStore[av_var] = av_match.authorised_values;
-                    }
-                );
-            })
-            .then(() => {
-                this.initialized = true;
+        const initialized = ref(false);
+
+        onBeforeMount(() => {
+            loading();
+            loadAuthorisedValues(authorisedValues.value, SIP2Store).then(() => {
+                loaded();
+                initialized.value = true;
             });
+        });
+
+        return {
+            initialized,
+        };
     },
     components: {
         Breadcrumbs,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2AccountResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2AccountResource.vue
index 6771daea1e..86b60261e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2AccountResource.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2AccountResource.vue
@@ -1,961 +1,944 @@
+<template>
+    <BaseResource :routeAction="routeAction" :instancedResource="this" />
+</template>
+
 <script>
 import { inject } from "vue";
 import BaseResource from "./../BaseResource.vue";
+import { useBaseResource } from "../../composables/base-resource.js";
 import { storeToRefs } from "pinia";
 import { APIClient } from "../../fetch/api-client.js";
+import { $__ } from "@koha-vue/i18n";
 
 export default {
-    extends: BaseResource,
+    name: "SIP2AccountResource",
+    components: {
+        BaseResource,
+    },
     props: {
         routeAction: String,
     },
+    emits: ["select-resource"],
     setup(props) {
-        const AVStore = inject("AVStore");
-        const { av_lost } = storeToRefs(AVStore);
-
-        return {
-            ...BaseResource.setup({
-                resourceName: "account",
-                nameAttr: "login_id",
-                idAttr: "sip_account_id",
-                showComponent: "SIP2AccountsShow",
-                listComponent: "SIP2AccountsList",
-                addComponent: "SIP2AccountsFormAdd",
-                editComponent: "SIP2AccountsFormAddEdit",
-                apiClient: APIClient.sip2.accounts,
-                resourceTableUrl: APIClient.sip2._baseURL + "accounts",
-                formGroupsDisplayMode: "accordion", // or default 'groups'
-                i18n: {
-                    displayName: __("Account"),
-                    displayNameLowerCase: __("account"),
-                    displayNamePlural: __("accounts"),
-                },
-                av_lost,
-            }),
+        const explodeValues = (value, delimiter) => {
+            if (!value) return null;
+            return Array.isArray(value) ? value : value.split(delimiter);
         };
-    },
-    data() {
-        return {
-            resourceAttrs: [
-                {
-                    name: "login_id",
-                    required: true,
+
+        const getSIPFields = () => [
+            { value: "AA", description: "AA" },
+            { value: "AB", description: "AB" },
+            { value: "AC", description: "AC" },
+            { value: "AD", description: "AD" },
+            { value: "AE", description: "AE" },
+            { value: "AF", description: "AF" },
+            { value: "AG", description: "AG" },
+            { value: "AH", description: "AH" },
+            { value: "AJ", description: "AJ" },
+            { value: "AL", description: "AL" },
+            { value: "AM", description: "AM" },
+            { value: "AN", description: "AN" },
+            { value: "AO", description: "AO" },
+            { value: "AP", description: "AP" },
+            { value: "AQ", description: "AQ" },
+            { value: "AR", description: "AR" },
+            { value: "AS", description: "AS" },
+            { value: "AT", description: "AT" },
+            { value: "AU", description: "AU" },
+            { value: "AV", description: "AV" },
+            { value: "AW", description: "AW" },
+            { value: "AX", description: "AX" },
+            { value: "AY", description: "AY" },
+            { value: "AZ", description: "AZ" },
+            { value: "BA", description: "BA" },
+            { value: "BB", description: "BB" },
+            { value: "BC", description: "BC" },
+            { value: "BD", description: "BD" },
+            { value: "BE", description: "BE" },
+            { value: "BF", description: "BF" },
+            { value: "BG", description: "BG" },
+            { value: "BH", description: "BH" },
+            { value: "BI", description: "BI" },
+            { value: "BJ", description: "BJ" },
+            { value: "BK", description: "BK" },
+            { value: "BL", description: "BL" },
+            { value: "BM", description: "BM" },
+            { value: "BN", description: "BN" },
+            { value: "BO", description: "BO" },
+            { value: "BP", description: "BP" },
+            { value: "BQ", description: "BQ" },
+            { value: "BR", description: "BR" },
+            { value: "BS", description: "BS" },
+            { value: "BT", description: "BT" },
+            { value: "BU", description: "BU" },
+            { value: "BV", description: "BV" },
+            { value: "BW", description: "BW" },
+            { value: "BX", description: "BX" },
+            { value: "BY", description: "BY" },
+            { value: "BZ", description: "BZ" },
+            { value: "CA", description: "CA" },
+            { value: "CB", description: "CB" },
+            { value: "CC", description: "CC" },
+            { value: "CD", description: "CD" },
+            { value: "CE", description: "CE" },
+            { value: "CF", description: "CF" },
+            { value: "CG", description: "CG" },
+            { value: "CH", description: "CH" },
+            { value: "CI", description: "CI" },
+            { value: "CJ", description: "CJ" },
+            { value: "CK", description: "CK" },
+            { value: "CL", description: "CL" },
+            { value: "CM", description: "CM" },
+            { value: "CN", description: "CN" },
+            { value: "CO", description: "CO" },
+            { value: "CP", description: "CP" },
+            { value: "CQ", description: "CQ" },
+            { value: "CR", description: "CR" },
+            { value: "CS", description: "CS" },
+            { value: "CT", description: "CT" },
+            { value: "CV", description: "CV" },
+            { value: "CY", description: "CY" },
+            { value: "DA", description: "DA" },
+            { value: "PB", description: "PB" },
+            { value: "PC", description: "PC" },
+            { value: "PI", description: "PI" },
+        ];
+
+        const resourceAttrs = [
+            {
+                name: "login_id",
+                required: true,
+                type: "text",
+                label: __("Account login id"),
+                group: "Details",
+            },
+            {
+                name: "login_password",
+                required: true,
+                type: "text",
+                label: __("Account login password"),
+                group: "Details",
+                hideIn: ["List"],
+            },
+            {
+                name: "sip_institution_id",
+                type: "relationshipSelect",
+                label: __("Institution"),
+                required: true,
+                showElement: {
                     type: "text",
-                    label: __("Account login id"),
-                    group: "Details",
+                    value: "institution.name",
+                    link: {
+                        href: "/cgi-bin/koha/sip2/institutions",
+                        slug: "sip_institution_id",
+                    },
                 },
-                {
-                    name: "login_password",
-                    required: true,
-                    type: "text",
-                    label: __("Account login password"),
-                    group: "Details",
+                relationshipAPIClient: APIClient.sip2.institutions,
+                relationshipOptionLabelAttr: "name",
+                relationshipRequiredKey: "sip_institution_id",
+                group: "Details",
+            },
+            {
+                name: "allow_additional_materials_checkout",
+                type: "boolean",
+                label: __("Allow additional materials checkout"),
+                group: "Details",
+                hideIn: ["List"],
+                toolTip: __(
+                    "If enabled, allows patrons to check out items via SIP even if the item has additional materials"
+                ),
+            },
+            {
+                name: "allow_empty_passwords",
+                type: "boolean",
+                label: __("Allow empty passwords"),
+                group: "Details",
+                hideIn: ["List"],
+            },
+            {
+                name: "allow_fields",
+                type: "select",
+                allowMultipleChoices: true,
+                defaultValue: null,
+                options: getSIPFields(),
+                requiredKey: "value",
+                selectLabel: "description",
+                label: __("Allow fields"),
+                group: "Details",
+                hideIn: ["List"],
+                toolTip: __(
+                    "Hides all fields not in the list, it is the inverse of hide_fields ( hide_fields takes precedence )"
+                ),
+            },
+            {
+                name: "blocked_item_types",
+                type: "relationshipSelect",
+                allowMultipleChoices: true,
+                defaultValue: null,
+                relationshipAPIClient: APIClient.item.item_types,
+                relationshipOptionLabelAttr: "description",
+                relationshipRequiredKey: "item_type_id",
+                label: __("Blocked item types"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "List of item types that are blocked from being issued at this SIP account"
+                ),
+            },
+            {
+                name: "checked_in_ok",
+                type: "boolean",
+                label: __("Checked in OK"),
+                hideIn: ["List"],
+                group: "Details",
+            },
+            {
+                name: "convert_nonprinting_characters",
+                type: "text",
+                label: __("Convert nonprinting characters"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "Convert control and non-space separator characters into the given string"
+                ),
+            },
+            {
+                name: "cr_item_field",
+                type: "select",
+                label: __("CR item field"),
+                options: [
+                    {
+                        value: "shelving_location",
+                        description: __("Shelving location"),
+                    },
+                    {
+                        value: "collection_code",
+                        description: __("Collection code"),
+                    },
+                ],
+                requiredKey: "value",
+                selectLabel: "description",
+                hideIn: ["List"],
+                group: "Details",
+                defaultValue: "collection_code",
+                toolTip: __(
+                    "Arbitrary item field to be used as the value for the CR field. Defaults to 'collection_code'"
+                ),
+            },
+            {
+                name: "ct_always_send",
+                type: "boolean",
+                label: __("CT always send"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __("Always send the CT field, even if it is empty"),
+            },
+            {
+                name: "cv_send_00_on_success",
+                type: "boolean",
+                label: __("CV always send 00 on success"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    'Checkin success message to return a CV field of value "00" rather than no CV field at all'
+                ),
+            },
+            {
+                name: "cv_triggers_alert",
+                type: "boolean",
+                label: __("CV triggers alert"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "Only set the alert flag if a value in the CV field is sent"
+                ),
+            },
+            {
+                name: "delimiter",
+                type: "text",
+                label: __("Delimiter"),
+                placeholder: "|",
+                group: "Details",
+            },
+            {
+                name: "disallow_overpayment",
+                type: "boolean",
+                label: __("Disallow overpayment"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "Set if over-paying a patron's account via SIP2 should fail, rather than create a credit on the account"
+                ),
+            },
+            {
+                name: "encoding",
+                type: "select",
+                label: __("Encoding"),
+                options: [
+                    { value: "utf8", description: __("utf8") },
+                    { value: "ascii", description: __("ascii") },
+                ],
+                defaultValue: null,
+                requiredKey: "value",
+                selectLabel: "description",
+                group: "Details",
+            },
+            {
+                name: "error_detect",
+                type: "boolean",
+                label: __("Error detect"),
+                group: "Details",
+            },
+            {
+                name: "format_due_date",
+                type: "boolean",
+                label: __("Format due date"),
+                hideIn: ["List"],
+                group: "Details",
+            },
+            {
+                name: "hide_fields",
+                type: "select",
+                allowMultipleChoices: true,
+                defaultValue: null,
+                options: getSIPFields(),
+                requiredKey: "value",
+                selectLabel: "description",
+                label: __("Hide fields"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "Hides all fields in the list, it is the inverse of allow_fields ( hide_fields takes precedence )"
+                ),
+            },
+            {
+                name: "holds_block_checkin",
+                type: "boolean",
+                label: __("Holds block checkin"),
+                hideIn: ["List"],
+                group: "Details",
+            },
+            {
+                name: "holds_get_captured",
+                type: "boolean",
+                label: __("Holds get captured"),
+                hideIn: ["List"],
+                group: "Details",
+            },
+            {
+                name: "inhouse_item_types",
+                type: "relationshipSelect",
+                allowMultipleChoices: true,
+                defaultValue: null,
+                relationshipAPIClient: APIClient.item.item_types,
+                relationshipOptionLabelAttr: "description",
+                relationshipRequiredKey: "item_type_id",
+                label: __("Inhouse item types"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "Item types that can only do in house checkouts via SIP self check machines"
+                ),
+            },
+            {
+                name: "inhouse_patron_categories",
+                type: "relationshipSelect",
+                allowMultipleChoices: true,
+                defaultValue: null,
+                relationshipAPIClient: APIClient.patron.categories,
+                relationshipOptionLabelAttr: "name",
+                relationshipRequiredKey: "patron_category_id",
+                label: __("Inhouse patron categories"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "Patron categories that can only do in house checkouts via SIP self check machines"
+                ),
+            },
+            {
+                name: "lost_block_checkout",
+                type: "number",
+                label: __("Lost block checkout"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "If a patron has more than a certain number of lost items (default is 1), a flag is set"
+                ),
+                placeholder: "1",
+            },
+            {
+                name: "lost_block_checkout_value",
+                type: "number",
+                label: __("Lost block checkout value"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "Specifies the minimum value of a lost item to be counted towards the lost_block_checkout threshold."
+                ),
+                placeholder: "1",
+            },
+            {
+                name: "lost_status_for_missing",
+                type: "select",
+                label: __("Lost status for missing"),
+                avCat: "av_lost",
+                defaultValue: null,
+                hideIn: ["List"],
+                group: "Details",
+            },
+            {
+                name: "overdues_block_checkout",
+                type: "boolean",
+                label: __("Overdues block checkout"),
+                hideIn: ["List"],
+                group: "Details",
+            },
+            {
+                name: "payment_type_writeoff",
+                type: "text",
+                label: __("Payment type writeoff"),
+                hideIn: ["List"],
+                group: "Details",
+                placeholder: "06",
+            },
+            {
+                name: "prevcheckout_block_checkout",
+                type: "boolean",
+                label: __("Previous checkout block checkout"),
+                hideIn: ["List"],
+                group: "Details",
+            },
+            {
+                name: "register_id",
+                type: "relationshipSelect",
+                label: __("Cash register"),
+                relationshipAPIClient: APIClient.cash.cash_registers,
+                relationshipOptionLabelAttr: "name", // attr of the related resource used for display
+                relationshipRequiredKey: "cash_register_id",
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "Only required if system preference UseCashRegisters is enabled"
+                ),
+            },
+            {
+                name: "seen_on_item_information",
+                type: "select",
+                label: __("Seen on item information"),
+                options: [
+                    { value: "mark_found", description: __("Mark found") },
+                    { value: "keep_lost", description: __("Keep lost") },
+                ],
+                defaultValue: null,
+                requiredKey: "value",
+                selectLabel: "description",
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "If set, the item information SIP message will update the datelastseen field for items. For lost items, will either keep them as'lost' or mark them as 'found' depending on the setting"
+                ),
+            },
+            {
+                name: "send_patron_home_library_in_af",
+                type: "boolean",
+                label: __("Send patron home library in AF"),
+                hideIn: ["List"],
+                group: "Details",
+            },
+            {
+                name: "show_checkin_message",
+                type: "boolean",
+                label: __("Show checkin message"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "If enabled, successful checking responses will contain an AF screen message"
+                ),
+            },
+            {
+                name: "show_outstanding_amount",
+                type: "boolean",
+                label: __("Show outstanding amount"),
+                hideIn: ["List"],
+                group: "Details",
+                toolTip: __(
+                    "If enabled, if the patron has outstanding charges, the total outstanding amount is displayed on SIP checkout"
+                ),
+            },
+            {
+                name: "terminator",
+                type: "select",
+                options: [
+                    { value: "CRLF", description: "CRLF" },
+                    { value: "CR", description: "CR" },
+                ],
+                defaultValue: null,
+                requiredKey: "value",
+                selectLabel: "description",
+                label: __("Terminator"),
+                placeholder: "CRLF",
+                group: "Details",
+            },
+            {
+                name: "custom_patron_fields",
+                type: "relationshipWidget",
+                showElement: {
+                    type: "table",
+                    columnData: "custom_patron_fields",
+                    hidden: account => !!account.custom_patron_fields?.length,
+                    columns: [
+                        {
+                            name: __("Field"),
+                            value: "field",
+                        },
+                        {
+                            name: __("Template"),
+                            value: "template",
+                        },
+                    ],
                 },
-                {
-                    name: "sip_institution_id",
-                    type: "relationshipSelect",
-                    label: __("Institution"),
-                    required: true,
-                    showElement: {
+                hideIn: ["List"],
+                group: __("SIP response mappings"),
+                componentProps: {
+                    resourceRelationships: {
+                        resourceProperty: "custom_patron_fields",
+                    },
+                    relationshipStrings: {
+                        nameLowerCase: __("custom patron field"),
+                        nameUpperCase: __("Custom patron field"),
+                        namePlural: __("custom patron fields"),
+                    },
+                    newRelationshipDefaultAttrs: {
+                        type: "object",
+                        value: {
+                            field: null,
+                            template: null,
+                        },
+                    },
+                },
+                relationshipFields: [
+                    {
+                        name: "field",
+                        required: true,
+                        indexRequired: true,
                         type: "text",
-                        value: "institution.name",
-                        link: {
-                            href: "/cgi-bin/koha/sip2/institutions/1",
-                            // params: {
-                            //     bookseller_id: "vendor_id",
-                            // },
-                        },
+                        placeholder: "XY",
+                        label: __("Field"),
                     },
-                    relationshipAPIClient: APIClient.sip2.institutions,
-                    relationshipOptionLabelAttr: "name", // attr of the related resource used for display
-                    relationshipRequiredKey: "sip_institution_id",
-                    group: "Details",
-                },
-                {
-                    name: "allow_additional_materials_checkout",
-                    type: "boolean",
-                    label: __("Allow additional materials checkout"),
-                    group: "Details",
-                    toolTip: __(
-                        "If enabled, allows patrons to check out items via SIP even if the item has additional materials"
-                    ),
-                },
-                {
-                    name: "allow_empty_passwords",
-                    type: "boolean",
-                    label: __("Allow empty passwords"),
-                    group: "Details",
-                },
-                {
-                    name: "allow_fields",
-                    type: "select",
-                    allowMultipleChoices: true,
-                    defaultValue: null,
-                    formatForForm: value => this.explodeValues(value, ","),
-                    options: this.getSIPFields(),
-                    requiredKey: "value",
-                    selectLabel: "description",
-                    label: __("Allow fields"),
-                    group: "Details",
-                    toolTip: __(
-                        "Hides all fields not in the list, it is the inverse of hide_fields ( hide_fields takes precedence )"
-                    ),
-                },
-                {
-                    name: "blocked_item_types",
-                    type: "relationshipSelect",
-                    allowMultipleChoices: true,
-                    formatForForm: value => this.explodeValues(value, "|"),
-                    defaultValue: null,
-                    relationshipAPIClient: APIClient.item.item_types,
-                    relationshipOptionLabelAttr: "description",
-                    relationshipRequiredKey: "item_type_id",
-                    label: __("Blocked item types"),
-                    group: "Details",
-                    toolTip: __(
-                        "List of item types that are blocked from being issued at this SIP account"
-                    ),
-                },
-                {
-                    name: "checked_in_ok",
-                    type: "boolean",
-                    label: __("Checked in OK"),
-                    group: "Details",
-                },
-                {
-                    name: "convert_nonprinting_characters",
-                    type: "text",
-                    label: __("Convert nonprinting characters"),
-                    group: "Details",
-                    toolTip: __(
-                        "Convert control and non-space separator characters into the given string"
-                    ),
-                },
-                {
-                    name: "cr_item_field",
-                    type: "select",
-                    label: __("CR item field"),
-                    options: [
-                        {
-                            value: "shelving_location",
-                            description: __("Shelving location"),
-                        },
-                        {
-                            value: "collection_code",
-                            description: __("Collection code"),
-                        },
-                    ],
-                    requiredKey: "value",
-                    selectLabel: "description",
-                    group: "Details",
-                    defaultValue: "collection_code",
-                    toolTip: __(
-                        "Arbitrary item field to be used as the value for the CR field. Defaults to 'collection_code'"
-                    ),
-                },
-                {
-                    name: "ct_always_send",
-                    type: "boolean",
-                    label: __("CT always send"),
-                    group: "Details",
-                    toolTip: __(
-                        "Always send the CT field, even if it is empty"
-                    ),
-                },
-                {
-                    name: "cv_send_00_on_success",
-                    type: "boolean",
-                    label: __("CV always send 00 on success"),
-                    group: "Details",
-                    toolTip: __(
-                        'Checkin success message to return a CV field of value "00" rather than no CV field at all'
-                    ),
-                },
-                {
-                    name: "cv_triggers_alert",
-                    type: "boolean",
-                    label: __("CV triggers alert"),
-                    group: "Details",
-                    toolTip: __(
-                        "Only set the alert flag if a value in the CV field is sent"
-                    ),
-                },
-                {
-                    name: "delimiter",
-                    type: "text",
-                    label: __("Delimiter"),
-                    placeholder: "|",
-                    group: "Details",
-                },
-                {
-                    name: "disallow_overpayment",
-                    type: "boolean",
-                    label: __("Disallow overpayment"),
-                    group: "Details",
-                    toolTip: __(
-                        "Set if over-paying a patron's account via SIP2 should fail, rather than create a credit on the account"
-                    ),
-                },
-                {
-                    name: "encoding",
-                    type: "select",
-                    label: __("Encoding"),
-                    options: [
-                        { value: "utf8", description: __("utf8") },
-                        { value: "ascii", description: __("ascii") },
-                    ],
-                    defaultValue: null,
-                    requiredKey: "value",
-                    selectLabel: "description",
-                    group: "Details",
-                },
-                {
-                    name: "error_detect",
-                    type: "boolean",
-                    label: __("Error detect"),
-                    group: "Details",
-                },
-                {
-                    name: "format_due_date",
-                    type: "boolean",
-                    label: __("Format due date"),
-                    group: "Details",
-                },
-                {
-                    name: "hide_fields",
-                    type: "select",
-                    allowMultipleChoices: true,
-                    defaultValue: null,
-                    formatForForm: value => this.explodeValues(value, ","),
-                    options: this.getSIPFields(),
-                    requiredKey: "value",
-                    selectLabel: "description",
-                    label: __("Hide fields"),
-                    group: "Details",
-                    toolTip: __(
-                        "Hides all fields in the list, it is the inverse of allow_fields ( hide_fields takes precedence )"
-                    ),
-                },
-                {
-                    name: "holds_block_checkin",
-                    type: "boolean",
-                    label: __("Holds block checkin"),
-                    group: "Details",
-                },
-                {
-                    name: "holds_get_captured",
-                    type: "boolean",
-                    label: __("Holds get captured"),
-                    group: "Details",
-                },
-                {
-                    name: "inhouse_item_types",
-                    type: "relationshipSelect",
-                    allowMultipleChoices: true,
-                    defaultValue: null,
-                    formatForForm: value => this.explodeValues(value, ","),
-                    relationshipAPIClient: APIClient.item.item_types,
-                    relationshipOptionLabelAttr: "description",
-                    relationshipRequiredKey: "item_type_id",
-                    label: __("Inhouse item types"),
-                    group: "Details",
-                    toolTip: __(
-                        "Item types that can only do in house checkouts via SIP self check machines"
-                    ),
-                },
-                {
-                    name: "inhouse_patron_categories",
-                    type: "relationshipSelect",
-                    allowMultipleChoices: true,
-                    defaultValue: null,
-                    formatForForm: value => this.explodeValues(value, ","),
-                    relationshipAPIClient: APIClient.patron.patron_categories,
-                    relationshipOptionLabelAttr: "name",
-                    relationshipRequiredKey: "patron_category_id",
-                    label: __("Inhouse patron categories"),
-                    group: "Details",
-                    toolTip: __(
-                        "Patron categories that can only do in house checkouts via SIP self check machines"
-                    ),
-                },
-                {
-                    name: "lost_block_checkout",
-                    type: "number",
-                    label: __("Lost block checkout"),
-                    group: "Details",
-                    toolTip: __(
-                        "If a patron has more than a certain number of lost items (default is 1), a flag is set"
-                    ),
-                    placeholder: 1,
-                },
-                {
-                    name: "lost_block_checkout_value",
-                    type: "number",
-                    label: __("Lost block checkout value"),
-                    group: "Details",
-                    toolTip: __(
-                        "Specifies the minimum value of a lost item to be counted towards the lost_block_checkout threshold."
-                    ),
-                    placeholder: 1,
-                },
-                {
-                    name: "lost_status_for_missing",
-                    type: "select",
-                    label: __("Lost status for missing"),
-                    formatForForm: value => (value ? value.toString() : null),
-                    avCat: "av_lost",
-                    defaultValue: null,
-                    group: "Details",
-                },
-                {
-                    name: "overdues_block_checkout",
-                    type: "boolean",
-                    label: __("Overdues block checkout"),
-                    group: "Details",
-                },
-                {
-                    name: "payment_type_writeoff",
-                    type: "text",
-                    label: __("Payment type writeoff"),
-                    group: "Details",
-                    placeholder: "06",
-                },
-                {
-                    name: "prevcheckout_block_checkout",
-                    type: "boolean",
-                    label: __("Previous checkout block checkout"),
-                    group: "Details",
-                },
-                {
-                    name: "register_id",
-                    type: "relationshipSelect",
-                    label: __("Cash register"),
-                    relationshipAPIClient: APIClient.cash.cash_registers,
-                    relationshipOptionLabelAttr: "name", // attr of the related resource used for display
-                    relationshipRequiredKey: "cash_register_id",
-                    group: "Details",
-                    toolTip: __(
-                        "Only required if system preference UseCashRegisters is enabled"
-                    ),
-                },
-                {
-                    name: "seen_on_item_information",
-                    type: "select",
-                    label: __("Seen on item information"),
-                    options: [
-                        { value: "mark_found", description: __("Mark found") },
-                        { value: "keep_lost", description: __("Keep lost") },
-                    ],
-                    defaultValue: null,
-                    requiredKey: "value",
-                    selectLabel: "description",
-                    group: "Details",
-                    toolTip: __(
-                        "If set, the item information SIP message will update the datelastseen field for items. For lost items, will either keep them as'lost' or mark them as 'found' depending on the setting"
-                    ),
-                },
-                {
-                    name: "send_patron_home_library_in_af",
-                    type: "boolean",
-                    label: __("Send patron home library in AF"),
-                    group: "Details",
-                },
-                {
-                    name: "show_checkin_message",
-                    type: "boolean",
-                    label: __("Show checkin message"),
-                    group: "Details",
-                    toolTip: __(
-                        "If enabled, successful checking responses will contain an AF screen message"
-                    ),
-                },
-                {
-                    name: "show_outstanding_amount",
-                    type: "boolean",
-                    label: __("Show outstanding amount"),
-                    group: "Details",
-                    toolTip: __(
-                        "If enabled, if the patron has outstanding charges, the total outstanding amount is displayed on SIP checkout"
-                    ),
-                },
-                {
-                    name: "terminator",
-                    type: "select",
-                    options: [
-                        { value: "CRLF", description: "CRLF" },
-                        { value: "CR", description: "CR" },
-                    ],
-                    defaultValue: null,
-                    requiredKey: "value",
-                    selectLabel: "description",
-                    label: __("Terminator"),
-                    placeholder: "CRLF",
-                    group: "Details",
-                },
-                {
-                    name: "custom_patron_fields",
-                    type: "relationshipWidget",
-                    showElement: {
-                        type: "table",
-                        columnData: "custom_patron_fields",
-                        hidden: account =>
-                            !!account.custom_patron_fields?.length,
-                        columns: [
-                            {
-                                name: __("Field"),
-                                value: "field",
-                            },
-                            {
-                                name: __("Template"),
-                                value: "template",
-                            },
-                        ],
+                    {
+                        name: "template",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "[% patron.dateexpiry %]",
+                        label: __("Template"),
                     },
-                    group: __("SIP response mappings"),
-                    componentProps: {
-                        resourceRelationships: {
-                            resourceProperty: "custom_patron_fields",
-                        },
-                        relationshipStrings: {
-                            nameLowerCase: __("custom patron field"),
-                            nameUpperCase: __("Custom patron field"),
-                            namePlural: __("custom patron fields"),
-                        },
-                        newRelationshipDefaultAttrs: {
-                            type: "object",
-                            value: {
-                                field: null,
-                                template: null,
-                            },
-                        },
-                    },
-                    relationshipFields: [
+                ],
+            },
+            {
+                name: "patron_attributes",
+                type: "relationshipWidget",
+                showElement: {
+                    type: "table",
+                    columnData: "patron_attributes",
+                    hidden: account => !!account.patron_attributes?.length,
+                    columns: [
                         {
-                            name: "field",
-                            required: true,
-                            type: "text",
-                            placeholder: "XY",
-                            label: __("Field"),
+                            name: __("Field"),
+                            value: "field",
                         },
                         {
-                            name: "template",
-                            required: true,
-                            type: "text",
-                            placeholder: "[% patron.dateexpiry %]",
-                            label: __("Template"),
+                            name: __("Code"),
+                            value: "code",
                         },
                     ],
                 },
-                {
-                    name: "patron_attributes",
-                    type: "relationshipWidget",
-                    showElement: {
-                        type: "table",
-                        columnData: "patron_attributes",
-                        hidden: account => !!account.patron_attributes?.length,
-                        columns: [
-                            {
-                                name: __("Field"),
-                                value: "field",
-                            },
-                            {
-                                name: __("Code"),
-                                value: "code",
-                            },
-                        ],
+                hideIn: ["List"],
+                group: __("SIP response mappings"),
+                componentProps: {
+                    resourceRelationships: {
+                        resourceProperty: "patron_attributes",
                     },
-                    group: __("SIP response mappings"),
-                    componentProps: {
-                        resourceRelationships: {
-                            resourceProperty: "patron_attributes",
-                        },
-                        relationshipStrings: {
-                            nameLowerCase: __("patron attribute"),
-                            nameUpperCase: __("Patron attribute"),
-                            namePlural: __("patron attributes"),
-                        },
-                        newRelationshipDefaultAttrs: {
-                            type: "object",
-                            value: {
-                                field: null,
-                                code: null,
-                            },
+                    relationshipStrings: {
+                        nameLowerCase: __("patron attribute"),
+                        nameUpperCase: __("Patron attribute"),
+                        namePlural: __("patron attributes"),
+                    },
+                    newRelationshipDefaultAttrs: {
+                        type: "object",
+                        value: {
+                            field: null,
+                            code: null,
                         },
                     },
-                    relationshipFields: [
+                },
+                relationshipFields: [
+                    {
+                        name: "field",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "XY",
+                        label: __("Field"),
+                    },
+                    {
+                        name: "code",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "CODE",
+                        label: __("Code"),
+                    },
+                ],
+            },
+            {
+                name: "custom_item_fields",
+                type: "relationshipWidget",
+                showElement: {
+                    type: "table",
+                    columnData: "custom_item_fields",
+                    hidden: account => !!account.custom_item_fields?.length,
+                    columns: [
                         {
-                            name: "field",
-                            required: true,
-                            type: "text",
-                            placeholder: "XY",
-                            label: __("Field"),
+                            name: __("Field"),
+                            value: "field",
                         },
                         {
-                            name: "code",
-                            required: true,
-                            type: "text",
-                            placeholder: "CODE",
-                            label: __("Code"),
+                            name: __("Template"),
+                            value: "template",
                         },
                     ],
                 },
-                {
-                    name: "custom_item_fields",
-                    type: "relationshipWidget",
-                    showElement: {
-                        type: "table",
-                        columnData: "custom_item_fields",
-                        hidden: account => !!account.custom_item_fields?.length,
-                        columns: [
-                            {
-                                name: __("Field"),
-                                value: "field",
-                            },
-                            {
-                                name: __("Template"),
-                                value: "template",
-                            },
-                        ],
+                hideIn: ["List"],
+                group: __("SIP response mappings"),
+                componentProps: {
+                    resourceRelationships: {
+                        resourceProperty: "custom_item_fields",
                     },
-                    group: __("SIP response mappings"),
-                    componentProps: {
-                        resourceRelationships: {
-                            resourceProperty: "custom_item_fields",
-                        },
-                        relationshipStrings: {
-                            nameLowerCase: __("custom item field"),
-                            nameUpperCase: __("Custom item field"),
-                            namePlural: __("custom item fields"),
-                        },
-                        newRelationshipDefaultAttrs: {
-                            type: "object",
-                            value: {
-                                field: null,
-                                template: null,
-                            },
+                    relationshipStrings: {
+                        nameLowerCase: __("custom item field"),
+                        nameUpperCase: __("Custom item field"),
+                        namePlural: __("custom item fields"),
+                    },
+                    newRelationshipDefaultAttrs: {
+                        type: "object",
+                        value: {
+                            field: null,
+                            template: null,
                         },
                     },
-                    relationshipFields: [
+                },
+                relationshipFields: [
+                    {
+                        name: "field",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "IN",
+                        label: __("Field"),
+                    },
+                    {
+                        name: "template",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "[% item.itemnumber %]",
+                        label: __("Template"),
+                    },
+                ],
+            },
+            {
+                name: "item_fields",
+                type: "relationshipWidget",
+                showElement: {
+                    type: "table",
+                    columnData: "item_fields",
+                    hidden: account => !!account.item_fields?.length,
+                    columns: [
                         {
-                            name: "field",
-                            required: true,
-                            type: "text",
-                            placeholder: "IN",
-                            label: __("Field"),
+                            name: __("Field"),
+                            value: "field",
                         },
                         {
-                            name: "template",
-                            required: true,
-                            type: "text",
-                            placeholder: "[% item.itemnumber %]",
-                            label: __("Template"),
+                            name: __("Code"),
+                            value: "code",
                         },
                     ],
                 },
-                {
-                    name: "item_fields",
-                    type: "relationshipWidget",
-                    showElement: {
-                        type: "table",
-                        columnData: "item_fields",
-                        hidden: account => !!account.item_fields?.length,
-                        columns: [
-                            {
-                                name: __("Field"),
-                                value: "field",
-                            },
-                            {
-                                name: __("Code"),
-                                value: "code",
-                            },
-                        ],
+                hideIn: ["List"],
+                group: __("SIP response mappings"),
+                componentProps: {
+                    resourceRelationships: {
+                        resourceProperty: "item_fields",
                     },
-                    group: __("SIP response mappings"),
-                    componentProps: {
-                        resourceRelationships: {
-                            resourceProperty: "item_fields",
-                        },
-                        relationshipStrings: {
-                            nameLowerCase: __("item field"),
-                            nameUpperCase: __("Item field"),
-                            namePlural: __("item fields"),
-                        },
-                        newRelationshipDefaultAttrs: {
-                            type: "object",
-                            value: {
-                                field: null,
-                                code: null,
-                            },
+                    relationshipStrings: {
+                        nameLowerCase: __("item field"),
+                        nameUpperCase: __("Item field"),
+                        namePlural: __("item fields"),
+                    },
+                    newRelationshipDefaultAttrs: {
+                        type: "object",
+                        value: {
+                            field: null,
+                            code: null,
                         },
                     },
-                    relationshipFields: [
+                },
+                relationshipFields: [
+                    {
+                        name: "field",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "XY",
+                        label: __("Field"),
+                    },
+                    {
+                        name: "code",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "permanent_location",
+                        label: __("Code"),
+                    },
+                ],
+            },
+            {
+                name: "sort_bin_mappings",
+                type: "relationshipWidget",
+                showElement: {
+                    type: "table",
+                    columnData: "sort_bin_mappings",
+                    hidden: account => !!account.sort_bin_mappings?.length,
+                    columns: [
                         {
-                            name: "field",
-                            required: true,
-                            type: "text",
-                            placeholder: "XY",
-                            label: __("Field"),
-                        },
-                        {
-                            name: "code",
-                            required: true,
-                            type: "text",
-                            placeholder: "permanent_location",
-                            label: __("Code"),
+                            name: __("Mapping"),
+                            value: "mapping",
                         },
                     ],
                 },
-                {
-                    name: "sort_bin_mappings",
-                    type: "relationshipWidget",
-                    showElement: {
-                        type: "table",
-                        columnData: "sort_bin_mappings",
-                        hidden: account => !!account.sort_bin_mappings?.length,
-                        columns: [
-                            {
-                                name: __("Mapping"),
-                                value: "mapping",
-                            },
-                        ],
+                hideIn: ["List"],
+                group: __("SIP response mappings"),
+                componentProps: {
+                    resourceRelationships: {
+                        resourceProperty: "sort_bin_mappings",
                     },
-                    group: __("SIP response mappings"),
-                    componentProps: {
-                        resourceRelationships: {
-                            resourceProperty: "sort_bin_mappings",
-                        },
-                        relationshipStrings: {
-                            nameLowerCase: __("sort bin mapping"),
-                            nameUpperCase: __("Sort bin mapping"),
-                            namePlural: __("sort bin mappings"),
-                        },
-                        newRelationshipDefaultAttrs: {
-                            type: "object",
-                            value: {
-                                mapping: null,
-                            },
+                    relationshipStrings: {
+                        nameLowerCase: __("sort bin mapping"),
+                        nameUpperCase: __("Sort bin mapping"),
+                        namePlural: __("sort bin mappings"),
+                    },
+                    newRelationshipDefaultAttrs: {
+                        type: "object",
+                        value: {
+                            mapping: null,
                         },
                     },
-                    relationshipFields: [
+                },
+                relationshipFields: [
+                    {
+                        name: "mapping",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "CPL:location:eq:OFFICE:2",
+                        label: __("Mapping"),
+                    },
+                ],
+            },
+            {
+                name: "screen_msg_regexs",
+                type: "relationshipWidget",
+                showElement: {
+                    type: "table",
+                    columnData: "screen_msg_regexs",
+                    hidden: account => !!account.screen_msg_regexs?.length,
+                    columns: [
                         {
-                            name: "mapping",
-                            required: true,
-                            type: "text",
-                            placeholder: "CPL:location:eq:OFFICE:2",
-                            label: __("Mapping"),
+                            name: __("Find"),
+                            value: "find",
+                        },
+                        {
+                            name: __("Replace"),
+                            value: "replace",
                         },
                     ],
                 },
-                {
-                    name: "screen_msg_regexs",
-                    type: "relationshipWidget",
-                    showElement: {
-                        type: "table",
-                        columnData: "screen_msg_regexs",
-                        hidden: account => !!account.screen_msg_regexs?.length,
-                        columns: [
-                            {
-                                name: __("Find"),
-                                value: "find",
-                            },
-                            {
-                                name: __("Replace"),
-                                value: "replace",
-                            },
-                        ],
+                hideIn: ["List"],
+                group: __("SIP response mappings"),
+                componentProps: {
+                    resourceRelationships: {
+                        resourceProperty: "screen_msg_regexs",
                     },
-                    group: __("SIP response mappings"),
-                    componentProps: {
-                        resourceRelationships: {
-                            resourceProperty: "screen_msg_regexs",
-                        },
-                        relationshipStrings: {
-                            nameLowerCase: __("screen msg regex"),
-                            nameUpperCase: __("Screen msg regex"),
-                            namePlural: __("screen msg regexs"),
-                        },
-                        newRelationshipDefaultAttrs: {
-                            type: "object",
-                            value: {
-                                find: null,
-                                replace: null,
-                            },
+                    relationshipStrings: {
+                        nameLowerCase: __("screen msg regex"),
+                        nameUpperCase: __("Screen msg regex"),
+                        namePlural: __("screen msg regexs"),
+                    },
+                    newRelationshipDefaultAttrs: {
+                        type: "object",
+                        value: {
+                            find: null,
+                            replace: null,
                         },
                     },
-                    relationshipFields: [
+                },
+                relationshipFields: [
+                    {
+                        name: "find",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "Greetings from Koha.",
+                        label: __("Find"),
+                    },
+                    {
+                        name: "replace",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "Welcome to your library!",
+                        label: __("Replace"),
+                    },
+                ],
+            },
+            {
+                name: "system_preference_overrides",
+                type: "relationshipWidget",
+                showElement: {
+                    type: "table",
+                    columnData: "system_preference_overrides",
+                    hidden: account =>
+                        !!account.system_preference_overrides?.length,
+                    columns: [
                         {
-                            name: "find",
-                            required: true,
-                            type: "text",
-                            placeholder: "Greetings from Koha.",
-                            label: __("Find"),
+                            name: __("Variable"),
+                            value: "variable",
                         },
                         {
-                            name: "replace",
-                            required: true,
-                            type: "text",
-                            placeholder: "Welcome to your library!",
-                            label: __("Replace"),
+                            name: __("Value"),
+                            value: "value",
                         },
                     ],
                 },
-                {
-                    name: "system_preference_overrides",
-                    type: "relationshipWidget",
-                    showElement: {
-                        type: "table",
-                        columnData: "system_preference_overrides",
-                        hidden: account =>
-                            !!account.system_preference_overrides?.length,
-                        columns: [
-                            {
-                                name: __("Variable"),
-                                value: "variable",
-                            },
-                            {
-                                name: __("Value"),
-                                value: "value",
-                            },
-                        ],
+                hideIn: ["List"],
+                group: __("Syspref overrides"),
+                componentProps: {
+                    resourceRelationships: {
+                        resourceProperty: "system_preference_overrides",
                     },
-                    group: __("Syspref overrides"),
-                    componentProps: {
-                        resourceRelationships: {
-                            resourceProperty: "system_preference_overrides",
-                        },
-                        relationshipStrings: {
-                            nameLowerCase: __("system preference override"),
-                            nameUpperCase: __("System preference override"),
-                            namePlural: __("system preference overrides"),
-                        },
-                        newRelationshipDefaultAttrs: {
-                            type: "object",
-                            value: {
-                                variable: null,
-                                value: null,
-                            },
+                    relationshipStrings: {
+                        nameLowerCase: __("system preference override"),
+                        nameUpperCase: __("System preference override"),
+                        namePlural: __("system preference overrides"),
+                    },
+                    newRelationshipDefaultAttrs: {
+                        type: "object",
+                        value: {
+                            variable: null,
+                            value: null,
                         },
                     },
-                    relationshipFields: [
-                        {
-                            name: "variable",
-                            required: true,
-                            type: "text",
-                            placeholder: "AllFinesNeedOverride",
-                            label: __("Variable"),
-                        },
-                        {
-                            name: "value",
-                            required: true,
-                            type: "text",
-                            placeholder: "1",
-                            label: __("Value"),
-                        },
-                    ],
                 },
-                {
-                    name: "ae_field_template",
-                    type: "textarea",
-                    label: __("AE field template"),
-                    placeholder:
-                        "[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]",
-                    group: "Templates",
-                },
-                {
-                    name: "av_field_template",
-                    type: "textarea",
-                    label: __("AV field template"),
-                    placeholder:
-                        "[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]",
-                    group: "Templates",
-                },
-                {
-                    name: "da_field_template",
-                    type: "textarea",
-                    label: __("DA field template"),
-                    placeholder:
-                        "[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]",
-                    group: "Templates",
-                },
-            ],
-            tableOptions: {
-                columns: this.getTableColumns(),
-                url: () => this.resourceTableUrl,
+                relationshipFields: [
+                    {
+                        name: "variable",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "AllFinesNeedOverride",
+                        label: __("Variable"),
+                    },
+                    {
+                        name: "value",
+                        required: true,
+                        indexRequired: true,
+                        type: "text",
+                        placeholder: "1",
+                        label: __("Value"),
+                    },
+                ],
+            },
+            {
+                name: "ae_field_template",
+                type: "textarea",
+                label: __("AE field template"),
+                placeholder:
+                    "[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]",
+                hideIn: ["List"],
+                group: "Templates",
+            },
+            {
+                name: "av_field_template",
+                type: "textarea",
+                label: __("AV field template"),
+                placeholder:
+                    "[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]",
+                hideIn: ["List"],
+                group: "Templates",
+            },
+            {
+                name: "da_field_template",
+                type: "textarea",
+                label: __("DA field template"),
+                placeholder:
+                    "[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]",
+                hideIn: ["List"],
+                group: "Templates",
+            },
+        ];
+
+        const baseResource = useBaseResource({
+            resourceName: "account",
+            nameAttr: "login_id",
+            idAttr: "sip_account_id",
+            components: {
+                show: "SIP2AccountsShow",
+                list: "SIP2AccountsList",
+                add: "SIP2AccountsFormAdd",
+                edit: "SIP2AccountsFormAddEdit",
+            },
+            apiClient: APIClient.sip2.accounts,
+            i18n: {
+                deleteConfirmationMessage: $__(
+                    "Are you sure you want to remove this account?"
+                ),
+                deleteSuccessMessage: $__("Account %s deleted"),
+                displayName: $__("Account"),
+                editLabel: $__("Edit account #%s"),
+                emptyListMessage: $__("There are no accounts defined"),
+                newLabel: $__("New account"),
+            },
+            table: {
+                resourceTableUrl:
+                    APIClient.sip2.httpClient._baseURL + "accounts",
                 options: { embed: "institution" },
-                table_settings: this.accounts_table_settings,
-                actions: {
-                    0: ["show"],
-                    "-1": this.embedded
-                        ? [
-                              {
-                                  select: {
-                                      text: this.$__("Select"),
-                                      icon: "fa fa-check",
-                                  },
-                              },
-                          ]
-                        : ["edit", "delete"],
-                },
+            },
+            embedded: props.embedded,
+            formGroupsDisplayMode: "accordion",
+            resourceAttrs,
+            props,
+            moduleStore: "SIP2Store",
+        });
+
+        const tableOptions = {
+            url: () => baseResource.getResourceTableUrl(),
+            options: { embed: "institution" },
+            table_settings: accounts_table_settings,
+            actions: {
+                0: ["show"],
+                "-1": ["edit", "delete"],
             },
         };
-    },
-    methods: {
-        getSIPFields: function () {
-            return [
-                { value: "AA", description: "AA" },
-                { value: "AB", description: "AB" },
-                { value: "AC", description: "AC" },
-                { value: "AD", description: "AD" },
-                { value: "AE", description: "AE" },
-                { value: "AF", description: "AF" },
-                { value: "AG", description: "AG" },
-                { value: "AH", description: "AH" },
-                { value: "AJ", description: "AJ" },
-                { value: "AL", description: "AL" },
-                { value: "AM", description: "AM" },
-                { value: "AN", description: "AN" },
-                { value: "AO", description: "AO" },
-                { value: "AP", description: "AP" },
-                { value: "AQ", description: "AQ" },
-                { value: "AR", description: "AR" },
-                { value: "AS", description: "AS" },
-                { value: "AT", description: "AT" },
-                { value: "AU", description: "AU" },
-                { value: "AV", description: "AV" },
-                { value: "AW", description: "AW" },
-                { value: "AX", description: "AX" },
-                { value: "AY", description: "AY" },
-                { value: "AZ", description: "AZ" },
-                { value: "BA", description: "BA" },
-                { value: "BB", description: "BB" },
-                { value: "BC", description: "BC" },
-                { value: "BD", description: "BD" },
-                { value: "BE", description: "BE" },
-                { value: "BF", description: "BF" },
-                { value: "BG", description: "BG" },
-                { value: "BH", description: "BH" },
-                { value: "BI", description: "BI" },
-                { value: "BJ", description: "BJ" },
-                { value: "BK", description: "BK" },
-                { value: "BL", description: "BL" },
-                { value: "BM", description: "BM" },
-                { value: "BN", description: "BN" },
-                { value: "BO", description: "BO" },
-                { value: "BP", description: "BP" },
-                { value: "BQ", description: "BQ" },
-                { value: "BR", description: "BR" },
-                { value: "BS", description: "BS" },
-                { value: "BT", description: "BT" },
-                { value: "BU", description: "BU" },
-                { value: "BV", description: "BV" },
-                { value: "BW", description: "BW" },
-                { value: "BX", description: "BX" },
-                { value: "BY", description: "BY" },
-                { value: "BZ", description: "BZ" },
-                { value: "CA", description: "CA" },
-                { value: "CB", description: "CB" },
-                { value: "CC", description: "CC" },
-                { value: "CD", description: "CD" },
-                { value: "CE", description: "CE" },
-                { value: "CF", description: "CF" },
-                { value: "CG", description: "CG" },
-                { value: "CH", description: "CH" },
-                { value: "CI", description: "CI" },
-                { value: "CJ", description: "CJ" },
-                { value: "CK", description: "CK" },
-                { value: "CL", description: "CL" },
-                { value: "CM", description: "CM" },
-                { value: "CN", description: "CN" },
-                { value: "CO", description: "CO" },
-                { value: "CP", description: "CP" },
-                { value: "CQ", description: "CQ" },
-                { value: "CR", description: "CR" },
-                { value: "CS", description: "CS" },
-                { value: "CT", description: "CT" },
-                { value: "CV", description: "CV" },
-                { value: "CY", description: "CY" },
-                { value: "DA", description: "DA" },
-                { value: "PB", description: "PB" },
-                { value: "PC", description: "PC" },
-                { value: "PI", description: "PI" },
-            ];
-        },
-        explodeValues: function (value, delimiter) {
-            if (!value) {
-                return null;
-            }
-            return Array.isArray(value) ? value : value.split(delimiter);
-        },
-        getTableColumns: function () {
-            return [
-                {
-                    title: __("Login"),
-                    data: "login_id:sip_account_id",
-                    searchable: true,
-                    orderable: true,
-                    render: function (data, type, row, meta) {
-                        return (
-                            '<a role="button" class="show">' +
-                            escape_str(
-                                `${row.login_id} (#${row.sip_account_id})`
-                            ) +
-                            "</a>"
-                        );
-                    },
-                },
-                {
-                    title: __("Institution"),
-                    data: "sip_institution_id",
-                    searchable: true,
-                    orderable: true,
-                    render: function (data, type, row, meta) {
-                        return row.sip_institution_id != undefined
-                            ? '<a href="/cgi-bin/koha/sip2/institutions/' +
-                                  row.sip_institution_id +
-                                  '">' +
-                                  escape_str(row.institution.name) +
-                                  "</a>"
-                            : "";
-                    },
-                },
-                {
-                    title: __("Delimiter"),
-                    data: "delimiter",
-                    searchable: true,
-                    orderable: true,
-                },
-                {
-                    title: __("Encoding"),
-                    data: "encoding",
-                    searchable: true,
-                    orderable: true,
-                },
-                {
-                    title: __("Error detect"),
-                    data: "error_detect",
-                    searchable: true,
-                    orderable: true,
-                    render: function (data, type, row, meta) {
-                        return escape_str(
-                            row.error_detect ? __("Yes") : __("No")
-                        );
-                    },
-                },
-                {
-                    title: __("Terminator"),
-                    data: "terminator",
-                    searchable: true,
-                    orderable: true,
-                },
-            ];
-        },
-        onSubmit(e, accountToSave) {
+
+        const onFormSave = async (e, accountToSave) => {
             e.preventDefault();
 
-            let account = JSON.parse(JSON.stringify(accountToSave)); // copy
-            let sip_account_id = account.sip_account_id;
+            const account = JSON.parse(JSON.stringify(accountToSave));
+            const sip_account_id = account.sip_account_id;
 
             delete account.sip_account_id;
+            delete account.institution;
 
             account.allow_fields = account.allow_fields?.join(",");
             account.hide_fields = account.hide_fields?.join(",");
@@ -964,40 +947,66 @@ export default {
                 account.inhouse_patron_categories?.join(",");
             account.blocked_item_types = account.blocked_item_types?.join("|");
 
-            if (!account.terminator) {
-                account.terminator = null;
-            }
+            if (!account.terminator) account.terminator = null;
 
-            account.item_fields = account.item_fields.map(
-                ({ account_id, account_item_field_id, ...keepAttrs }) =>
-                    keepAttrs
+            account.item_fields = account.item_fields?.map(
+                ({ account_id, account_item_field_id, ...rest }) => rest
+            );
+            account.patron_attributes = account.patron_attributes?.map(
+                ({ account_id, account_patron_attribute_id, ...rest }) => rest
             );
 
-            account.patron_attributes = account.patron_attributes.map(
-                ({ account_id, account_patron_attribute_id, ...keepAttrs }) =>
-                    keepAttrs
-            );
+            const client = APIClient.sip2.accounts;
 
-            const client = APIClient.sip2;
-            if (sip_account_id) {
-                client.accounts.update(account, sip_account_id).then(
-                    success => {
-                        this.setMessage(this.$__("Account updated"));
-                        this.$router.push({ name: "SIP2AccountsList" });
-                    },
-                    error => {}
-                );
-            } else {
-                client.accounts.create(account).then(
-                    success => {
-                        this.setMessage(this.$__("Account created"));
-                        this.$router.push({ name: "SIP2AccountsList" });
-                    },
-                    error => {}
-                );
+            try {
+                if (sip_account_id) {
+                    await client.update(account, sip_account_id);
+                    baseResource.setMessage(__("Account updated"));
+                } else {
+                    await client.create(account);
+                    baseResource.setMessage(__("Account created"));
+                }
+
+                baseResource.router.push({ name: "SIP2AccountsList" });
+            } catch (error) {
+                // Handle errors if needed
             }
-        },
+        };
+
+        const afterResourceFetch = (componentData, resource, caller) => {
+            if (caller === "form") {
+                resource.allow_fields = explodeValues(
+                    resource.allow_fields,
+                    ","
+                );
+                resource.blocked_item_types = explodeValues(
+                    resource.blocked_item_types,
+                    "|"
+                );
+                resource.hide_fields = explodeValues(resource.hide_fields, ",");
+                resource.inhouse_item_types = explodeValues(
+                    resource.inhouse_item_types,
+                    ","
+                );
+                resource.inhouse_patron_categories = explodeValues(
+                    resource.inhouse_patron_categories,
+                    ","
+                );
+                resource.lost_status_for_missing =
+                    resource.lost_status_for_missing
+                        ? resource.lost_status_for_missing.toString()
+                        : null;
+            }
+        };
+
+        return {
+            ...baseResource,
+            tableOptions,
+            getSIPFields,
+            explodeValues,
+            onFormSave,
+            afterResourceFetch,
+        };
     },
-    name: "SIP2AccountResource",
 };
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2InstitutionResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2InstitutionResource.vue
index d69ae73cc4..ecd80d2938 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2InstitutionResource.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2InstitutionResource.vue
@@ -1,34 +1,49 @@
+<template>
+    <BaseResource :routeAction="routeAction" :instancedResource="this" />
+</template>
+
 <script>
+import { inject } from "vue";
 import BaseResource from "./../BaseResource.vue";
+import { useBaseResource } from "../../composables/base-resource.js";
 import { APIClient } from "../../fetch/api-client.js";
+import { $__ } from "@koha-vue/i18n";
 
 export default {
-    extends: BaseResource,
+    name: "SIP2InstitutionResource",
+    components: {
+        BaseResource,
+    },
     props: {
         routeAction: String,
     },
+    emits: ["select-resource"],
     setup(props) {
-        return {
-            ...BaseResource.setup({
-                resourceName: "institution",
-                nameAttr: "name",
-                idAttr: "sip_institution_id",
-                showComponent: "SIP2InstitutionsShow",
-                listComponent: "SIP2InstitutionsList",
-                addComponent: "SIP2InstitutionsFormAdd",
-                editComponent: "SIP2InstitutionsFormAddEdit",
-                apiClient: APIClient.sip2.institutions,
-                resourceTableUrl: APIClient.sip2._baseURL + "institutions",
-                i18n: {
-                    displayName: __("Institution"),
-                    displayNameLowerCase: __("institution"),
-                    displayNamePlural: __("institutions"),
-                },
-            }),
-        };
-    },
-    data() {
-        return {
+        const baseResource = useBaseResource({
+            resourceName: "institution",
+            nameAttr: "name",
+            idAttr: "sip_institution_id",
+            components: {
+                show: "SIP2InstitutionsShow",
+                list: "SIP2InstitutionsList",
+                add: "SIP2InstitutionsFormAdd",
+                edit: "SIP2InstitutionsFormAddEdit",
+            },
+            apiClient: APIClient.sip2.institutions,
+            i18n: {
+                deleteConfirmationMessage: $__(
+                    "Are you sure you want to remove this institution?"
+                ),
+                deleteSuccessMessage: $__("Institution %s deleted"),
+                displayName: $__("Institution"),
+                editLabel: $__("Edit institution #%s"),
+                emptyListMessage: $__("There are no institutions defined"),
+                newLabel: $__("New institution"),
+            },
+            table: {
+                resourceTableUrl:
+                    APIClient.sip2.httpClient._baseURL + "institutions",
+            },
             resourceAttrs: [
                 {
                     name: "name",
@@ -97,7 +112,7 @@ export default {
                 {
                     name: "retries",
                     required: true,
-                    type: "text",
+                    type: "number",
                     label: __("Retries"),
                     show_in_table: true,
                     group: "Policy",
@@ -121,7 +136,7 @@ export default {
                 {
                     name: "timeout",
                     required: true,
-                    type: "text",
+                    type: "number",
                     label: __("Timeout"),
                     showInTable: true,
                     group: "Policy",
@@ -131,57 +146,47 @@ export default {
                     ),
                 },
             ],
-            tableOptions: {
-                columns: this.getTableColumns(),
-                url: () => this.resourceTableUrl,
-                table_settings: this.institutions_table_settings,
-                actions: {
-                    0: ["show"],
-                    "-1": this.embedded
-                        ? [
-                              {
-                                  select: {
-                                      text: this.$__("Select"),
-                                      icon: "fa fa-check",
-                                  },
-                              },
-                          ]
-                        : ["edit", "delete"],
-                },
+            props: props,
+        });
+
+        const tableOptions = {
+            url: () => baseResource.getResourceTableUrl(),
+            table_settings: institutions_table_settings,
+            actions: {
+                0: ["show"],
+                "-1": ["edit", "delete"],
             },
         };
-    },
-    methods: {
-        onSubmit(e, institutionToSave) {
+
+        const onFormSave = async (e, institutionToSave) => {
             e.preventDefault();
 
-            let institution = JSON.parse(JSON.stringify(institutionToSave)); // copy
-            let sip_institution_id = institution.sip_institution_id;
-
+            let institution = JSON.parse(JSON.stringify(institutionToSave));
+            const sip_institution_id = institution.sip_institution_id;
             delete institution.sip_institution_id;
 
-            const client = APIClient.sip2;
-            if (sip_institution_id) {
-                client.institutions
-                    .update(institution, sip_institution_id)
-                    .then(
-                        success => {
-                            this.setMessage(this.$__("Institution updated"));
-                            this.$router.push({ name: "SIP2InstitutionsList" });
-                        },
-                        error => {}
+            try {
+                if (sip_institution_id) {
+                    await baseResource.apiClient.update(
+                        institution,
+                        sip_institution_id
                     );
-            } else {
-                client.institutions.create(institution).then(
-                    success => {
-                        this.setMessage(this.$__("Institution created"));
-                        this.$router.push({ name: "SIP2InstitutionsList" });
-                    },
-                    error => {}
-                );
+                    baseResource.setMessage(__("Institution updated"));
+                } else {
+                    await baseResource.apiClient.create(institution);
+                    baseResource.setMessage(__("Institution created"));
+                }
+                baseResource.router.push({ name: "SIP2InstitutionsList" });
+            } catch (error) {
+                // Handle error here if needed
             }
-        },
+        };
+
+        return {
+            ...baseResource,
+            tableOptions,
+            onFormSave,
+        };
     },
-    name: "SIP2InstitutionResource",
 };
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2SystemPreferenceOverrideResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2SystemPreferenceOverrideResource.vue
index 840d4d8a97..cfc92fc341 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2SystemPreferenceOverrideResource.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2SystemPreferenceOverrideResource.vue
@@ -1,87 +1,70 @@
+<template>
+    <BaseResource :routeAction="routeAction" :instancedResource="this" />
+</template>
 <script>
+import { computed } from "vue";
 import BaseResource from "./../BaseResource.vue";
+import { useBaseResource } from "../../composables/base-resource.js";
 import { APIClient } from "../../fetch/api-client.js";
+import { $__ } from "@koha-vue/i18n";
 
 export default {
-    extends: BaseResource,
+    name: "SIP2SystemPreferenceOverrideResource",
+    components: {
+        BaseResource,
+    },
     props: {
         routeAction: String,
     },
     setup(props) {
-        return {
-            ...BaseResource.setup({
-                resourceName: "system_preference_override",
-                nameAttr: "variable",
-                idAttr: "sip_system_preference_override_id",
-                showComponent: "SIP2SystemPreferenceOverridesShow",
-                listComponent: "SIP2SystemPreferenceOverridesList",
-                addComponent: "SIP2SystemPreferenceOverridesFormAdd",
-                editComponent: "SIP2SystemPreferenceOverridesFormAddEdit",
-                apiClient: APIClient.sip2.system_preference_overrides,
+        const baseResource = useBaseResource({
+            resourceName: "system_preference_override",
+            nameAttr: "variable",
+            idAttr: "sip_system_preference_override_id",
+            components: {
+                show: "SIP2SystemPreferenceOverridesShow",
+                list: "SIP2SystemPreferenceOverridesList",
+                add: "SIP2SystemPreferenceOverridesFormAdd",
+                edit: "SIP2SystemPreferenceOverridesFormAddEdit",
+            },
+            apiClient: APIClient.sip2.system_preference_overrides,
+            table: {
                 resourceTableUrl:
-                    APIClient.sip2._baseURL + "system_preference_overrides",
-                i18n: {
-                    displayName: __("System preference override"),
-                    displayNameLowerCase: __("system preference override"),
-                    displayNamePlural: __("system preference overrides"),
-                },
-            }),
-        };
-    },
-    data() {
-        return {
+                    APIClient.sip2.httpClient._baseURL +
+                    "system_preference_overrides",
+            },
+            i18n: {
+                deleteConfirmationMessage: $__(
+                    "Are you sure you want to remove this system preference override?"
+                ),
+                deleteSuccessMessage: $__(
+                    "System preference override %s deleted"
+                ),
+                displayName: $__("System preference override"),
+                editLabel: $__("Edit system preference override #%s"),
+                emptyListMessage: $__(
+                    "There are no system preference overrides defined"
+                ),
+                newLabel: $__("New system preference override"),
+            },
             resourceAttrs: [
                 {
                     name: "variable",
                     required: true,
                     type: "text",
-                    label: __("Variable"),
+                    label: $__("Variable"),
                 },
                 {
                     name: "value",
                     required: true,
                     type: "text",
-                    label: __("Value"),
+                    label: $__("Value"),
                 },
             ],
-            tableOptions: {
-                columns: this.getTableColumns(),
-                url: () => this.resourceTableUrl,
-                table_settings: this.system_preference_overrides_table_settings,
-                actions: {
-                    0: ["show"],
-                    "-1": this.embedded
-                        ? [
-                              {
-                                  select: {
-                                      text: this.$__("Select"),
-                                      icon: "fa fa-check",
-                                  },
-                              },
-                          ]
-                        : ["edit", "delete"],
-                },
-            },
-        };
-    },
-    methods: {
-        getTableColumns: function () {
-            return [
-                {
-                    title: __("Variable"),
-                    data: "variable",
-                    searchable: true,
-                    orderable: true,
-                },
-                {
-                    title: __("Value"),
-                    data: "value",
-                    searchable: true,
-                    orderable: true,
-                },
-            ];
-        },
-        onSubmit(e, systemPreferenceOverrideToSave) {
+            props: props,
+        });
+
+        const onFormSave = async (e, systemPreferenceOverrideToSave) => {
             e.preventDefault();
 
             let system_preference_override = JSON.parse(
@@ -92,41 +75,44 @@ export default {
 
             delete system_preference_override.sip_system_preference_override_id;
 
-            const client = APIClient.sip2;
-            if (sip_system_preference_override_id) {
-                client.system_preference_overrides
-                    .update(
+            try {
+                if (sip_system_preference_override_id) {
+                    await baseResource.apiClient.update(
                         system_preference_override,
                         sip_system_preference_override_id
-                    )
-                    .then(
-                        success => {
-                            this.setMessage(
-                                this.$__("System preference override updated")
-                            );
-                            this.$router.push({
-                                name: "SIP2SystemPreferenceOverridesList",
-                            });
-                        },
-                        error => {}
                     );
-            } else {
-                client.system_preference_overrides
-                    .create(system_preference_override)
-                    .then(
-                        success => {
-                            this.setMessage(
-                                this.$__("System preference override created")
-                            );
-                            this.$router.push({
-                                name: "SIP2SystemPreferenceOverridesList",
-                            });
-                        },
-                        error => {}
+                    baseResource.setMessage(
+                        $__("System preference override updated")
                     );
+                } else {
+                    await baseResource.apiClient.create(
+                        system_preference_override
+                    );
+                    baseResource.setMessage(
+                        $__("System preference override created")
+                    );
+                }
+                baseResource.router.push({
+                    name: "SIP2SystemPreferenceOverridesList",
+                });
+            } catch (error) {
+                // Handle error here if needed
             }
-        },
+        };
+
+        const tableOptions = computed(() => ({
+            url: () => baseResource.getResourceTableUrl(),
+            table_settings: system_preference_overrides_table_settings,
+            actions: {
+                0: ["show"],
+                "-1": ["edit", "delete"],
+            },
+        }));
+        return {
+            ...baseResource,
+            tableOptions,
+            onFormSave,
+        };
     },
-    name: "SIP2SystemPreferenceOverrideResource",
 };
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/api-client.js b/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/api-client.js
index 3adc914420..2906a9c296 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/api-client.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/api-client.js
@@ -9,7 +9,7 @@ import CashAPIClient from "@fetch/cash-api-client";
 import ItemAPIClient from "@fetch/item-api-client";
 import RecordSourcesAPIClient from "@fetch/record-sources-api-client";
 import SysprefAPIClient from "@fetch/system-preferences-api-client";
-import SIP2APIClient from "@fetch/ssip2-api-client";
+import SIP2APIClient from "@fetch/sip2-api-client";
 import PreservationAPIClient from "@fetch/preservation-api-client";
 
 export const APIClient = {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/modules/sip2.ts b/koha-tmpl/intranet-tmpl/prog/js/vue/modules/sip2.ts
index c12a3fb08f..86777a1afe 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/modules/sip2.ts
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/modules/sip2.ts
@@ -21,7 +21,6 @@ import { routes as routesDef } from "../routes/sip2";
 
 import { useMainStore } from "../stores/main";
 import { useVendorStore } from "../stores/vendors";
-import { useAVStore } from "../stores/authorised-values";
 import { useSIP2Store } from "../stores/sip2";
 import { useNavigationStore } from "../stores/navigation";
 import i18n from "../i18n";
@@ -29,7 +28,6 @@ import i18n from "../i18n";
 const pinia = createPinia();
 
 const mainStore = useMainStore(pinia);
-const AVStore = useAVStore(pinia);
 const navigationStore = useNavigationStore(pinia);
 const routes = navigationStore.setRoutes(routesDef);
 
@@ -51,7 +49,6 @@ const rootComponent = app
 app.config.unwrapInjectedRef = true;
 app.provide("vendorStore", useVendorStore(pinia));
 app.provide("mainStore", mainStore);
-app.provide("AVStore", AVStore);
 app.provide("navigationStore", navigationStore);
 const SIP2Store = useSIP2Store(pinia);
 app.provide("SIP2Store", SIP2Store);
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/stores/sip2.js b/koha-tmpl/intranet-tmpl/prog/js/vue/stores/sip2.js
index f662d17c42..1c9d59826d 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/stores/sip2.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/stores/sip2.js
@@ -1,7 +1,6 @@
 import { defineStore } from "pinia";
 import { reactive, toRefs } from "vue";
 import { withAuthorisedValueActions } from "../composables/authorisedValues";
-import { $__ } from "@koha-vue/i18n";
 
 export const useSIP2Store = defineStore("erm", () => {
     const store = reactive({
diff --git a/t/cypress/integration/SIP2/Accounts.ts b/t/cypress/integration/SIP2/Accounts.ts
index 9eea610371..94e29a3926 100644
--- a/t/cypress/integration/SIP2/Accounts.ts
+++ b/t/cypress/integration/SIP2/Accounts.ts
@@ -87,7 +87,7 @@ describe("Accounts", () => {
             error: "Something went wrong",
         });
         cy.visit("/cgi-bin/koha/sip2/sip2.pl");
-        cy.get("#navmenulist").contains("Accounts").click();
+        cy.get(".sidebar_menu").contains("Accounts").click();
         cy.get("main div[class='alert alert-warning']").contains(
             /Something went wrong/
         );
@@ -95,7 +95,7 @@ describe("Accounts", () => {
         // GET accounts returns empty list
         cy.intercept("GET", "/api/v1/sip2/accounts*", []);
         cy.visit("/cgi-bin/koha/sip2/accounts");
-        cy.get("#account_list").contains("There are no accounts defined");
+        cy.get("#accounts_list").contains("There are no accounts defined");
 
         // GET accounts returns something
         let account = get_account();
@@ -111,7 +111,7 @@ describe("Accounts", () => {
         });
         cy.intercept("GET", "/api/v1/sip2/accounts/*", account);
         cy.visit("/cgi-bin/koha/sip2/accounts/");
-        cy.get("#account_list").contains("Showing 1 to 1 of 1 entries");
+        cy.get("#accounts_list").contains("Showing 1 to 1 of 1 entries");
     });
 
     it("Add account", () => {
@@ -132,14 +132,14 @@ describe("Accounts", () => {
         // Click the button in the toolbar
         cy.visit("/cgi-bin/koha/sip2/accounts");
         cy.contains("New account").click();
-        cy.get("#account_add h2").contains("New account");
+        cy.get("#accounts_add h2").contains("New account");
         cy.left_menu_active_item_is("Accounts");
 
         // Fill in the form for normal attributes
-        cy.get("#account_add").contains("Submit").click();
+        cy.get("#accounts_add").contains("Submit").click();
         cy.get("input:invalid,textarea:invalid,select:invalid").should(
             "have.length",
-            2
+            3
         );
         cy.get("#login_id").type(account.login_id);
         cy.get("#login_password").type(account.login_password);
@@ -196,13 +196,13 @@ describe("Accounts", () => {
 
         // relationshipWidgets
         cy.contains("Add new custom patron field").click();
-        cy.get("#account_add").contains("Submit").click();
+        cy.get("#accounts_add").contains("Submit").click();
         cy.get("input:invalid,textarea:invalid,select:invalid").should(
             "have.length",
             2
         );
 
-        // Add new periods
+        // Add new custom patron fields
         cy.contains("Add new custom patron field").click();
         cy.get("#custom_patron_fields_relationship > fieldset").should(
             "have.length",
@@ -211,8 +211,12 @@ describe("Accounts", () => {
 
         cy.contains("a", "Remove this custom patron field").click();
 
-        cy.get("#custom_patron_fields_0 #field").type("test");
-        cy.get("#custom_patron_fields_0 #template").type("test");
+        cy.get("#custom_patron_fields_0 #custom_patron_fields_field_0").type(
+            "test"
+        );
+        cy.get("#custom_patron_fields_0 #custom_patron_fields_template_0").type(
+            "test"
+        );
 
         cy.get(".accordion-item").each($el => {
             cy.wrap($el).children(".collapse").should("have.class", "show");
@@ -234,7 +238,7 @@ describe("Accounts", () => {
         cy.intercept("POST", "/api/v1/sip2/accounts", {
             statusCode: 500,
         });
-        cy.get("#account_add").contains("Submit").click();
+        cy.get("#accounts_add").contains("Submit").click();
 
         cy.get("main div[class='alert alert-warning']").contains(
             "Something went wrong: Error: Internal Server Error"
@@ -245,7 +249,7 @@ describe("Accounts", () => {
             statusCode: 201,
             body: account,
         });
-        cy.get("#account_add").contains("Submit").click();
+        cy.get("#accounts_add").contains("Submit").click();
         cy.get("main div[class='alert alert-info']").contains(
             "Account created"
         );
@@ -273,10 +277,9 @@ describe("Accounts", () => {
         );
 
         // Click the 'Edit' button from the list
-        cy.get("#account_list table tbody tr:first").contains("Edit").click();
+        cy.get("#accounts_list table tbody tr:first").contains("Edit").click();
         cy.wait("@get-account");
-        cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#account_add h2").contains("Edit account");
+        cy.get("#accounts_add h2").contains("Edit account");
         cy.left_menu_active_item_is("Accounts");
 
         // Form has been correctly filled in
@@ -301,11 +304,10 @@ describe("Accounts", () => {
                 statusCode: 500,
                 delay: 1000,
             });
-        });
-        cy.get("#account_add").contains("Submit").click();
-
+        }).as("edit-account");
+        cy.get("#accounts_add").contains("Submit").click();
         cy.get("main div[class='modal_centered']").contains("Submitting...");
-        cy.wait(1000);
+        cy.wait("@edit-account");
         cy.get("main div[class='alert alert-warning']").contains(
             "Something went wrong: Error: Internal Server Error"
         );
@@ -315,7 +317,7 @@ describe("Accounts", () => {
             statusCode: 200,
             body: account,
         });
-        cy.get("#account_add").contains("Submit").click();
+        cy.get("#accounts_add").contains("Submit").click();
         cy.get("main div[class='alert alert-info']").contains(
             "Account updated"
         );
@@ -332,20 +334,19 @@ describe("Accounts", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        });
+        }).as("get-accounts");
         cy.intercept("GET", "/api/v1/sip2/accounts/*", account).as(
             "get-account"
         );
         cy.visit("/cgi-bin/koha/sip2/accounts");
-        let name_link = cy.get("#account_list table tbody tr:first td:first a");
-        name_link.should(
-            "have.text",
-            account.login_id + " (#" + account.sip_account_id + ")"
+        cy.wait("@get-accounts");
+        let name_link = cy.get(
+            "#accounts_list table tbody tr:first td:first a"
         );
+        name_link.should("have.text", account.login_id);
         name_link.click();
         cy.wait("@get-account");
-        cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#account_show h2").contains(
+        cy.get("#accounts_show h2").contains(
             "Account #" + account.sip_account_id
         );
         cy.left_menu_active_item_is("Accounts");
@@ -364,11 +365,13 @@ describe("Accounts", () => {
                 "X-Base-Total-Count": "1",
                 "X-Total-Count": "1",
             },
-        });
+        }).as("get-accounts");
         cy.intercept("GET", "/api/v1/sip2/accounts/*", account);
         cy.visit("/cgi-bin/koha/sip2/accounts");
 
-        cy.get("#account_list table tbody tr:first").contains("Delete").click();
+        cy.get("#accounts_list table tbody tr:first")
+            .contains("Delete")
+            .click();
         cy.get(".alert-warning.confirmation h1").contains(
             "remove this account"
         );
@@ -388,7 +391,9 @@ describe("Accounts", () => {
             statusCode: 204,
             body: null,
         });
-        cy.get("#account_list table tbody tr:first").contains("Delete").click();
+        cy.get("#accounts_list table tbody tr:first")
+            .contains("Delete")
+            .click();
         cy.get(".alert-warning.confirmation h1").contains(
             "remove this account"
         );
@@ -399,37 +404,28 @@ describe("Accounts", () => {
 
         // Delete from show
         // Click the "name" link from the list
-        cy.intercept("GET", "/api/v1/sip2/accounts*", {
-            statusCode: 200,
-            body: accounts,
-            headers: {
-                "X-Base-Total-Count": "1",
-                "X-Total-Count": "1",
-            },
-        });
+        cy.visit("/cgi-bin/koha/sip2/accounts");
+        cy.wait("@get-accounts");
         cy.intercept("GET", "/api/v1/sip2/accounts/*", account).as(
             "get-account"
         );
-        cy.visit("/cgi-bin/koha/sip2/accounts");
-        let name_link = cy.get("#account_list table tbody tr:first td:first a");
-        name_link.should(
-            "have.text",
-            account.login_id + " (#" + account.sip_account_id + ")"
+        let name_link = cy.get(
+            "#accounts_list table tbody tr:first td:first a"
         );
+        name_link.should("have.text", account.login_id);
         name_link.click();
         cy.wait("@get-account");
-        cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#account_show h2").contains(
+        cy.get("#accounts_show h2").contains(
             "Account #" + account.sip_account_id
         );
 
-        cy.get("#account_show #toolbar").contains("Delete").click();
+        cy.get("#accounts_show #toolbar").contains("Delete").click();
         cy.get(".alert-warning.confirmation h1").contains(
             "remove this account"
         );
         cy.contains("Yes, delete").click();
 
         //Make sure we return to list after deleting from show
-        cy.get("#account_list table tbody tr:first");
+        cy.get("#accounts_list table tbody tr:first");
     });
 });
diff --git a/t/cypress/integration/SIP2/Institutions.ts b/t/cypress/integration/SIP2/Institutions.ts
index 390c3fa66a..8f56b332d7 100644
--- a/t/cypress/integration/SIP2/Institutions.ts
+++ b/t/cypress/integration/SIP2/Institutions.ts
@@ -13,7 +13,7 @@ describe("Institutions", () => {
             error: "Something went wrong",
         });
         cy.visit("/cgi-bin/koha/sip2/sip2.pl");
-        cy.get("#navmenulist").contains("Institutions").click();
+        cy.get(".sidebar_menu").contains("Institutions").click();
         cy.get("main div[class='alert alert-warning']").contains(
             /Something went wrong/
         );
@@ -21,7 +21,7 @@ describe("Institutions", () => {
         // GET institutions returns empty list
         cy.intercept("GET", "/api/v1/sip2/institutions*", []);
         cy.visit("/cgi-bin/koha/sip2/institutions");
-        cy.get("#institution_list").contains(
+        cy.get("#institutions_list").contains(
             "There are no institutions defined"
         );
 
@@ -39,7 +39,7 @@ describe("Institutions", () => {
         });
         cy.intercept("GET", "/api/v1/sip2/institutions/*", institution);
         cy.visit("/cgi-bin/koha/sip2/institutions/");
-        cy.get("#institution_list").contains("Showing 1 to 1 of 1 entries");
+        cy.get("#institutions_list").contains("Showing 1 to 1 of 1 entries");
     });
 
     it("Add institution", () => {
@@ -53,14 +53,14 @@ describe("Institutions", () => {
         // Click the button in the toolbar
         cy.visit("/cgi-bin/koha/sip2/institutions");
         cy.contains("New institution").click();
-        cy.get("#institution_add h2").contains("New institution");
+        cy.get("#institutions_add h2").contains("New institution");
         cy.left_menu_active_item_is("Institutions");
 
         // Fill in the form for normal attributes
-        cy.get("#institution_add").contains("Submit").click();
+        cy.get("#institutions_add").contains("Submit").click();
         cy.get("input:invalid,textarea:invalid,select:invalid").should(
             "have.length",
-            2
+            1
         );
         cy.get("#name").type(institution.name);
         cy.get("#implementation").type(institution.implementation);
@@ -81,7 +81,7 @@ describe("Institutions", () => {
         cy.intercept("POST", "/api/v1/sip2/institutions", {
             statusCode: 500,
         });
-        cy.get("#institution_add").contains("Submit").click();
+        cy.get("#institutions_add").contains("Submit").click();
 
         cy.get("main div[class='alert alert-warning']").contains(
             "Something went wrong: Error: Internal Server Error"
@@ -92,7 +92,7 @@ describe("Institutions", () => {
             statusCode: 201,
             body: institution,
         });
-        cy.get("#institution_add").contains("Submit").click();
+        cy.get("#institutions_add").contains("Submit").click();
         cy.get("main div[class='alert alert-info']").contains(
             "Institution created"
         );
@@ -120,12 +120,11 @@ describe("Institutions", () => {
         );
 
         // Click the 'Edit' button from the list
-        cy.get("#institution_list table tbody tr:first")
+        cy.get("#institutions_list table tbody tr:first")
             .contains("Edit")
             .click();
         cy.wait("@get-institution");
-        cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#institution_add h2").contains("Edit institution");
+        cy.get("#institutions_add h2").contains("Edit institution");
         cy.left_menu_active_item_is("Institutions");
 
         // Form has been correctly filled in
@@ -151,7 +150,7 @@ describe("Institutions", () => {
                 delay: 1000,
             });
         });
-        cy.get("#institution_add").contains("Submit").click();
+        cy.get("#institutions_add").contains("Submit").click();
 
         cy.get("main div[class='modal_centered']").contains("Submitting...");
         cy.wait(1000);
@@ -164,7 +163,7 @@ describe("Institutions", () => {
             statusCode: 200,
             body: institution,
         });
-        cy.get("#institution_add").contains("Submit").click();
+        cy.get("#institutions_add").contains("Submit").click();
         cy.get("main div[class='alert alert-info']").contains(
             "Institution updated"
         );
@@ -187,16 +186,12 @@ describe("Institutions", () => {
         );
         cy.visit("/cgi-bin/koha/sip2/institutions");
         let name_link = cy.get(
-            "#institution_list table tbody tr:first td:first a"
-        );
-        name_link.should(
-            "have.text",
-            institution.name + " (#" + institution.sip_institution_id + ")"
+            "#institutions_list table tbody tr:first td:first a"
         );
+        name_link.should("have.text", institution.name);
         name_link.click();
         cy.wait("@get-institution");
-        cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#institution_show h2").contains(
+        cy.get("#institutions_show h2").contains(
             "Institution #" + institution.sip_institution_id
         );
         cy.left_menu_active_item_is("Institutions");
@@ -219,7 +214,7 @@ describe("Institutions", () => {
         cy.intercept("GET", "/api/v1/sip2/institutions/*", institution);
         cy.visit("/cgi-bin/koha/sip2/institutions");
 
-        cy.get("#institution_list table tbody tr:first")
+        cy.get("#institutions_list table tbody tr:first")
             .contains("Delete")
             .click();
         cy.get(".alert-warning.confirmation h1").contains(
@@ -241,7 +236,7 @@ describe("Institutions", () => {
             statusCode: 204,
             body: null,
         });
-        cy.get("#institution_list table tbody tr:first")
+        cy.get("#institutions_list table tbody tr:first")
             .contains("Delete")
             .click();
         cy.get(".alert-warning.confirmation h1").contains(
@@ -267,26 +262,22 @@ describe("Institutions", () => {
         );
         cy.visit("/cgi-bin/koha/sip2/institutions");
         let name_link = cy.get(
-            "#institution_list table tbody tr:first td:first a"
-        );
-        name_link.should(
-            "have.text",
-            institution.name + " (#" + institution.sip_institution_id + ")"
+            "#institutions_list table tbody tr:first td:first a"
         );
+        name_link.should("have.text", institution.name);
         name_link.click();
         cy.wait("@get-institution");
-        cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#institution_show h2").contains(
+        cy.get("#institutions_show h2").contains(
             "Institution #" + institution.sip_institution_id
         );
 
-        cy.get("#institution_show #toolbar").contains("Delete").click();
+        cy.get("#institutions_show #toolbar").contains("Delete").click();
         cy.get(".alert-warning.confirmation h1").contains(
             "remove this institution"
         );
         cy.contains("Yes, delete").click();
 
         //Make sure we return to list after deleting from show
-        cy.get("#institution_list table tbody tr:first");
+        cy.get("#institutions_list table tbody tr:first");
     });
 });
diff --git a/t/cypress/integration/SIP2/SystemPreferenceOverrides.ts b/t/cypress/integration/SIP2/SystemPreferenceOverrides.ts
index 220f14da7f..6955b0faf3 100644
--- a/t/cypress/integration/SIP2/SystemPreferenceOverrides.ts
+++ b/t/cypress/integration/SIP2/SystemPreferenceOverrides.ts
@@ -21,7 +21,7 @@ describe("SystemPreferenceOverrides", () => {
             error: "Something went wrong",
         });
         cy.visit("/cgi-bin/koha/sip2/sip2.pl");
-        cy.get("#navmenulist").contains("System preference overrides").click();
+        cy.get(".sidebar_menu").contains("System preference overrides").click();
         cy.get("main div[class='alert alert-warning']").contains(
             /Something went wrong/
         );
@@ -29,7 +29,7 @@ describe("SystemPreferenceOverrides", () => {
         // GET system_preference_overrides returns empty list
         cy.intercept("GET", "/api/v1/sip2/system_preference_overrides*", []);
         cy.visit("/cgi-bin/koha/sip2/system_preference_overrides");
-        cy.get("#system_preference_override_list").contains(
+        cy.get("#system_preference_overrides_list").contains(
             "There are no system preference overrides defined"
         );
 
@@ -51,7 +51,7 @@ describe("SystemPreferenceOverrides", () => {
             system_preference_overrides
         );
         cy.visit("/cgi-bin/koha/sip2/system_preference_overrides/");
-        cy.get("#system_preference_override_list").contains(
+        cy.get("#system_preference_overrides_list").contains(
             "Showing 1 to 1 of 1 entries"
         );
     });
@@ -67,13 +67,13 @@ describe("SystemPreferenceOverrides", () => {
         // Click the button in the toolbar
         cy.visit("/cgi-bin/koha/sip2/system_preference_overrides");
         cy.contains("New system preference override").click();
-        cy.get("#system_preference_override_add h2").contains(
+        cy.get("#system_preference_overrides_add h2").contains(
             "New system preference override"
         );
         cy.left_menu_active_item_is("System preference overrides");
 
         // Fill in the form for normal attributes
-        cy.get("#system_preference_override_add").contains("Submit").click();
+        cy.get("#system_preference_overrides_add").contains("Submit").click();
         cy.get("input:invalid,textarea:invalid,select:invalid").should(
             "have.length",
             2
@@ -85,7 +85,7 @@ describe("SystemPreferenceOverrides", () => {
         cy.intercept("POST", "/api/v1/sip2/system_preference_overrides", {
             statusCode: 500,
         });
-        cy.get("#system_preference_override_add").contains("Submit").click();
+        cy.get("#system_preference_overrides_add").contains("Submit").click();
 
         cy.get("main div[class='alert alert-warning']").contains(
             "Something went wrong: Error: Internal Server Error"
@@ -96,7 +96,7 @@ describe("SystemPreferenceOverrides", () => {
             statusCode: 201,
             body: system_preference_override,
         });
-        cy.get("#system_preference_override_add").contains("Submit").click();
+        cy.get("#system_preference_overrides_add").contains("Submit").click();
         cy.get("main div[class='alert alert-info']").contains(
             "System preference override created"
         );
@@ -126,12 +126,12 @@ describe("SystemPreferenceOverrides", () => {
         ).as("get-system_preference_overrides");
 
         // Click the 'Edit' button from the list
-        cy.get("#system_preference_override_list table tbody tr:first")
+        cy.get("#system_preference_overrides_list table tbody tr:first")
             .contains("Edit")
             .click();
         cy.wait("@get-system_preference_overrides");
         cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#system_preference_override_add h2").contains(
+        cy.get("#system_preference_overrides_add h2").contains(
             "Edit system preference override"
         );
         cy.left_menu_active_item_is("System preference overrides");
@@ -157,7 +157,7 @@ describe("SystemPreferenceOverrides", () => {
                 });
             }
         );
-        cy.get("#system_preference_override_add").contains("Submit").click();
+        cy.get("#system_preference_overrides_add").contains("Submit").click();
 
         cy.get("main div[class='modal_centered']").contains("Submitting...");
         cy.wait(1000);
@@ -170,7 +170,7 @@ describe("SystemPreferenceOverrides", () => {
             statusCode: 200,
             body: system_preference_overrides,
         });
-        cy.get("#system_preference_override_add").contains("Submit").click();
+        cy.get("#system_preference_overrides_add").contains("Submit").click();
         cy.get("main div[class='alert alert-info']").contains(
             "System preference override updated"
         );
@@ -197,7 +197,7 @@ describe("SystemPreferenceOverrides", () => {
         );
         cy.visit("/cgi-bin/koha/sip2/system_preference_overrides");
 
-        cy.get("#system_preference_override_list table tbody tr:first")
+        cy.get("#system_preference_overrides_list table tbody tr:first")
             .contains("Delete")
             .click();
         cy.get(".alert-warning.confirmation h1").contains(
@@ -219,7 +219,7 @@ describe("SystemPreferenceOverrides", () => {
             statusCode: 204,
             body: null,
         });
-        cy.get("#system_preference_override_list table tbody tr:first")
+        cy.get("#system_preference_overrides_list table tbody tr:first")
             .contains("Delete")
             .click();
         cy.get(".alert-warning.confirmation h1").contains(