diff --git a/frontend/vue/components/Admin/StorageLocations.vue b/frontend/vue/components/Admin/StorageLocations.vue
index a3a2d1678..13163e172 100644
--- a/frontend/vue/components/Admin/StorageLocations.vue
+++ b/frontend/vue/components/Admin/StorageLocations.vue
@@ -148,17 +148,17 @@ const tabs = [
 const $datatable = ref(); // Template Ref
 
 const relist = () => {
-    $datatable.value.refresh();
+    $datatable.value?.refresh();
 };
 
 const $editModal = ref(); // Template Ref
 
 const doCreate = () => {
-    $editModal.value.create();
+    $editModal.value?.create();
 };
 
 const doEdit = (url) => {
-    $editModal.value.edit(url);
+    $editModal.value?.edit(url);
 };
 
 const setType = (type) => {
diff --git a/frontend/vue/components/Admin/StorageLocations/EditModal.vue b/frontend/vue/components/Admin/StorageLocations/EditModal.vue
index 1d39b0eb0..7936c1f91 100644
--- a/frontend/vue/components/Admin/StorageLocations/EditModal.vue
+++ b/frontend/vue/components/Admin/StorageLocations/EditModal.vue
@@ -4,11 +4,11 @@
         :loading="loading"
         :title="langTitle"
         :error="error"
-        :disable-save-button="v$.form.$invalid"
+        :disable-save-button="v$.$invalid"
         @submit="doSubmit"
         @hidden="clearContents"
     >
-        <storage-location-form :form="v$.form" />
+        <storage-location-form :form="v$" />
     </modal-form>
 </template>
 
@@ -52,7 +52,7 @@ export default {
             'storageQuota': ''
         }
 
-        const {form, resetForm} = useResettableRef(blankForm);
+        const {record: form, reset: resetForm} = useResettableRef(blankForm);
 
         const validations = computed(() => {
             let validationRules = {