diff --git a/lib/GADS.pm b/lib/GADS.pm
index 0d0db0750..4ab2dc0d0 100644
--- a/lib/GADS.pm
+++ b/lib/GADS.pm
@@ -340,6 +340,9 @@ hook before_template => sub {
     # Base 64 encoder for use in templates
     $tokens->{b64_filter} = sub { encode_base64(encode_json shift, '') };
 
+    $tokens->{actions} = session 'actions';
+    session->delete('actions');
+
     # This line used to be pre-request. However, occasionally errors have been
     # experienced with pages not submitting CSRF tokens. I think these may have
     # been race conditions where the session had been destroyed between the
@@ -2299,7 +2302,7 @@ prefix '/:layout_name' => sub {
     any ['get', 'post'] => '/data' => require_login sub {
 
         my $layout = var('layout') or pass;
-
+        
         my $user   = logged_in_user;
 
         my @additional_filters;
@@ -4675,6 +4678,7 @@ sub _process_edit
     );
     $params{layout} = var('layout') if var('layout'); # Used when creating a new record
 
+    my $actions;
     my $layout;
 
     if (my $delete_id = param 'delete')
@@ -4801,6 +4805,9 @@ sub _process_edit
                 my $forward = (!$id && $layout->forward_record_after_create) || param('submit') eq 'submit-and-remain'
                     ? 'record/'.$record->current_id
                     : $layout->identifier.'/data';
+                $actions->{clear_saved_values} = $id ? $id: 0;
+                session 'actions' => $actions;
+
                 return forwardHome(
                     { success => 'Submission has been completed successfully for record ID '.$record->current_id }, $forward );
             }
diff --git a/src/frontend/components/button/lib/cancel-button.ts b/src/frontend/components/button/lib/cancel-button.ts
index 0bbaf24d8..a81518d80 100644
--- a/src/frontend/components/button/lib/cancel-button.ts
+++ b/src/frontend/components/button/lib/cancel-button.ts
@@ -6,7 +6,7 @@ export default function createCancelButton(el: HTMLElement | JQuery<HTMLElement>
     $el.data('cancel-button', "true");
     $el.on('click', async () => {
         const href = $el.data('href');
-        await clearSavedFormValues($el.closest('form'));        
+        await clearSavedFormValues();
         if (href)
             window.location.href = href;
         else
diff --git a/src/frontend/components/button/lib/common.ts b/src/frontend/components/button/lib/common.ts
index 2c2909e80..7654c2103 100644
--- a/src/frontend/components/button/lib/common.ts
+++ b/src/frontend/components/button/lib/common.ts
@@ -1,22 +1,14 @@
-import gadsStorage from "util/gadsStorage";
+import StorageProvider from "util/storageProvider";
 
 /**
  * Clear all saved form values for the current record
  * @param $form The form to clear the data for
  */
-export async function clearSavedFormValues($form: JQuery<HTMLElement>) {
-    if (!$form || $form.length === 0) return;
-    const layout = layoutId();
-    const record = recordId();
+export async function clearSavedFormValues() {
     const ls = storage();
     const item = await ls.getItem(table_key());
 
-    if (item) ls.removeItem(`linkspace-record-change-${layout}-${record}`);
-    await Promise.all($form.find(".linkspace-field").map(async (_, el) => {
-        const field_id = $(el).data("column-id");
-        const item = await gadsStorage.getItem(`linkspace-column-${field_id}-${layout}-${record}`);
-        if (item) gadsStorage.removeItem(`linkspace-column-${field_id}-${layout}-${record}`);
-    }));
+    if (item) ls.clear();
 }
 
 /**
@@ -48,5 +40,5 @@ export function table_key() {
  * @returns The storage object
  */
 export function storage() {
-    return gadsStorage;
+    return new StorageProvider(table_key());
 }
\ No newline at end of file
diff --git a/src/frontend/components/button/lib/submit-draft-record-button.ts b/src/frontend/components/button/lib/submit-draft-record-button.ts
index 8c601ae74..2b3d67e89 100644
--- a/src/frontend/components/button/lib/submit-draft-record-button.ts
+++ b/src/frontend/components/button/lib/submit-draft-record-button.ts
@@ -11,7 +11,6 @@ export default function createSubmitDraftRecordButton(element: JQuery<HTMLElemen
 
         // Remove the required attribute from hidden required dependent fields
         $form.find(".form-group *[aria-required]").removeAttr('required');
-        // As the draft should save all changed values, we clear them from the local storage
-        await clearSavedFormValues(ev.target.closest("form"));
+        clearSavedFormValues();
     });
 }
diff --git a/src/frontend/components/button/lib/submit-record-button.ts b/src/frontend/components/button/lib/submit-record-button.ts
index 2977a7416..a857fa9c2 100644
--- a/src/frontend/components/button/lib/submit-record-button.ts
+++ b/src/frontend/components/button/lib/submit-record-button.ts
@@ -1,5 +1,4 @@
 import {validateRequiredFields} from "validation";
-import { clearSavedFormValues } from "./common";
 
 /**
  * Button to submit records
@@ -47,8 +46,6 @@ export default class SubmitRecordButton {
                     if ($button.prop("name")) {
                         $button.after(`<input type="hidden" name="${$button.prop("name")}" value="${$button.val()}" />`);
                     }
-                    // Clear the saved form values from local storage as they should now be saved to the record
-                    await clearSavedFormValues($form);
                 } else {
                     // Re-add the required attribute to required dependent fields
                     $requiredHiddenRecordDependentFields.attr('required', '');
diff --git a/src/frontend/components/form-group/autosave/lib/autosaveBase.ts b/src/frontend/components/form-group/autosave/lib/autosaveBase.ts
index f4127e876..912947632 100644
--- a/src/frontend/components/form-group/autosave/lib/autosaveBase.ts
+++ b/src/frontend/components/form-group/autosave/lib/autosaveBase.ts
@@ -1,5 +1,5 @@
 import { Component } from "component";
-import gadsStorage from "util/gadsStorage";
+import StorageProvider from "util/storageProvider";
 
 /**
  * Base class for autosave
@@ -39,7 +39,7 @@ export default abstract class AutosaveBase extends Component {
      * The storage object to use for autosave - this is a variable to allow for mocking in testing
      */
     get storage() {
-        return gadsStorage;
+        return new StorageProvider(`linkspace-record-change-${this.layoutId}-${this.recordId}`);
     }
 
     /**
diff --git a/src/frontend/components/modal/modals/curval/lib/component.js b/src/frontend/components/modal/modals/curval/lib/component.js
index 3e29fc7b3..5e0cfbba6 100644
--- a/src/frontend/components/modal/modals/curval/lib/component.js
+++ b/src/frontend/components/modal/modals/curval/lib/component.js
@@ -4,8 +4,8 @@ import { setFieldValues } from "set-field-values"
 import { guid as Guid } from "guid"
 import { initializeRegisteredComponents } from 'component'
 import { validateRadioGroup, validateCheckboxGroup } from 'validation'
-import gadsStorage from 'util/gadsStorage'
 import { fromJson } from 'util/common'
+import StorageProvider from 'util/storageProvider'
 
 class CurvalModalComponent extends ModalComponent {
 
@@ -217,7 +217,8 @@ class CurvalModalComponent extends ModalComponent {
     const id = location.pathname.split("/").pop()
     const record_id = isNaN(parseInt(id)) ? 0 : parseInt(id)
     const parent_key = `linkspace-column-${col_id}-${$('body').data('layout-identifier')}-${record_id}`;
-    let existing = fromJson(await gadsStorage.getItem(parent_key) ?? "[]")
+    const storageProvider = new StorageProvider(`linkspace-record-change-${$('body').data('layout-identifier')}-${record_id}`)
+    let existing = fromJson(await storageProvider.getItem(parent_key) ?? "[]")
     const identifier = current_id || guid
     // "existing" is the existing values for this curval
     // Pull out the current record if it exists
@@ -235,7 +236,7 @@ class CurvalModalComponent extends ModalComponent {
       }
       existing.push(existing_row)
       // Store as array for consistency with other field types
-      await gadsStorage.setItem(parent_key, JSON.stringify(existing))
+      await storageProvider.setItem(parent_key, JSON.stringify(existing))
     }
 
     $(this.element).modal('hide')
diff --git a/src/frontend/js/lib/util/actionsHandler/index.ts b/src/frontend/js/lib/util/actionsHandler/index.ts
new file mode 100644
index 000000000..e9ea72a01
--- /dev/null
+++ b/src/frontend/js/lib/util/actionsHandler/index.ts
@@ -0,0 +1,5 @@
+// We load all the actions in this file, nowhere else. This is to preserve encapsulation.
+import './lib/clearAutorecoverAction';
+import { handleActions } from "./lib/handler";
+
+export default handleActions;
diff --git a/src/frontend/js/lib/util/actionsHandler/lib/actionsLoader.test.ts b/src/frontend/js/lib/util/actionsHandler/lib/actionsLoader.test.ts
new file mode 100644
index 000000000..44d5be4cf
--- /dev/null
+++ b/src/frontend/js/lib/util/actionsHandler/lib/actionsLoader.test.ts
@@ -0,0 +1,26 @@
+import "../../../../../testing/globals.definitions";
+import {describe, it, expect} from '@jest/globals';
+import loadActions from './actionsLoader';
+
+describe('loadActions', () => {
+    it('should return undefined if actions_b64 is undefined', async () => {
+        const actions = await loadActions();
+        expect(actions).toBe(undefined);
+    });
+
+    it.skip('should return undefined if action_json is undefined', async () => {
+        // Skipped as this is not as easy to test as I'd expect
+        const $body = $('body');
+        $body.data('actions', '');
+        const actions = await loadActions();
+        expect(actions).toBe(undefined);
+    });
+
+    it('should return the actions object', async () => {
+        const actions_b64 = btoa(JSON.stringify({action: 'test'}));
+        const $body = $('body');
+        $body.data('actions', actions_b64);
+        const actions = await loadActions();
+        expect(actions).toEqual({action: 'test'});
+    });
+});
diff --git a/src/frontend/js/lib/util/actionsHandler/lib/actionsLoader.ts b/src/frontend/js/lib/util/actionsHandler/lib/actionsLoader.ts
new file mode 100644
index 000000000..474fd8647
--- /dev/null
+++ b/src/frontend/js/lib/util/actionsHandler/lib/actionsLoader.ts
@@ -0,0 +1,15 @@
+/**
+ * Load the actions object from the body data (Base64 encoded JSON)
+ * @returns An object representing the actions or undefined if no actions are defined
+ */
+const loadActions = async () => {
+    const $body = $('body');
+    const actions_b64 = $body.data('actions');
+    if (typeof actions_b64 == 'undefined') return;
+    const action_json = atob(actions_b64);
+    const actions = JSON.parse(action_json);
+    if (typeof actions == 'undefined') return;
+    return actions;
+};
+
+export default loadActions;
\ No newline at end of file
diff --git a/src/frontend/js/lib/util/actionsHandler/lib/clearAutorecoverAction.test.ts b/src/frontend/js/lib/util/actionsHandler/lib/clearAutorecoverAction.test.ts
new file mode 100644
index 000000000..2cbe47271
--- /dev/null
+++ b/src/frontend/js/lib/util/actionsHandler/lib/clearAutorecoverAction.test.ts
@@ -0,0 +1,30 @@
+import "../../../../../testing/globals.definitions";
+import { describe, it, expect } from '@jest/globals';
+import { clearAutorecoverAction } from './clearAutorecoverAction';
+import StorageProvider from "../../storageProvider/lib/storageProvider";
+
+describe('clearAutorecoverAction', () => {
+    it('Should not action if layout-identifier is undefined', async () => {
+        await expect(clearAutorecoverAction()).resolves.toBe(false);
+    });
+
+    it('Should not action if actions object is undefined', async () => {
+        $('body').data('layout-identifier', 'test');
+        await expect(clearAutorecoverAction()).resolves.toBe(false);
+    });
+
+    it('Should not action if clear_saved_values is not in actions object', async () => {
+        $('body').data('layout-identifier', 'test');
+        $('body').data('actions', btoa(JSON.stringify({})));
+        await expect(clearAutorecoverAction()).resolves.toBe(false);
+    });
+
+    it('Should clear storage provider', async () => {
+        $('body').data('layout-identifier', 'test');
+        $('body').data('actions', btoa(JSON.stringify({ clear_saved_values: 1 })));
+        const storage = new StorageProvider('linkspace-record-change-test-1');
+        await storage.setItem('key', 'value');
+        await expect(clearAutorecoverAction()).resolves.toBe(true);
+        await expect(storage.getItem('key')).resolves.toBe(undefined);
+    });
+});
diff --git a/src/frontend/js/lib/util/actionsHandler/lib/clearAutorecoverAction.ts b/src/frontend/js/lib/util/actionsHandler/lib/clearAutorecoverAction.ts
new file mode 100644
index 000000000..029fa1ec9
--- /dev/null
+++ b/src/frontend/js/lib/util/actionsHandler/lib/clearAutorecoverAction.ts
@@ -0,0 +1,33 @@
+import StorageProvider from "util/storageProvider";
+import { addAction } from "./handler";
+import loadActions from "./actionsLoader";
+
+// Exported to be used in tests - return values are to be used in tests
+export const clearAutorecoverAction = async () => {
+    // Load the body as a jQuery object
+    const $body = $('body');
+    // Get the layout identifier from the body data
+    const layoutId = $body.data('layout-identifier');
+    // If the layout identifier is undefined, return
+    if (typeof layoutId == 'undefined') return false;
+    // Load the actions object
+    const actions = await loadActions();
+    // If the actions object is undefined, return
+    if (typeof actions == 'undefined') return false;
+    // Get the record identifier from the actions object
+    const recordId = actions.clear_saved_values;
+    // If the record identifier is undefined, return
+    if (typeof recordId == 'undefined') return false;
+    // Create a table key using the layout identifier and record identifier
+    const tableKey = `linkspace-record-change-${layoutId}-${recordId}`;
+    // Create a new storage provider
+    const storage = new StorageProvider(tableKey);
+    // Clear the storage provider
+    await storage.clear();
+    return true;
+}
+
+/**
+ * Action handler for when a record is created or updated - only runs outside of a test environment
+ */
+if(!window.test) addAction(clearAutorecoverAction);
diff --git a/src/frontend/js/lib/util/actionsHandler/lib/handler.test.ts b/src/frontend/js/lib/util/actionsHandler/lib/handler.test.ts
new file mode 100644
index 000000000..b5aee7132
--- /dev/null
+++ b/src/frontend/js/lib/util/actionsHandler/lib/handler.test.ts
@@ -0,0 +1,11 @@
+import {describe, it, expect, jest} from '@jest/globals';
+import { addAction, handleActions } from './handler';
+
+describe('addAction', () => {
+    it('should add an action to the list of actions', () => {
+        const action = jest.fn();
+        addAction(action);
+        expect(()=>handleActions()).not.toThrow();
+        expect(action).toHaveBeenCalled();
+    });
+});
diff --git a/src/frontend/js/lib/util/actionsHandler/lib/handler.ts b/src/frontend/js/lib/util/actionsHandler/lib/handler.ts
new file mode 100644
index 000000000..d37686a9a
--- /dev/null
+++ b/src/frontend/js/lib/util/actionsHandler/lib/handler.ts
@@ -0,0 +1,25 @@
+/**
+ * This is the main file of the actions handler. These will trigger any actions as they are created in the application.
+ */
+
+/**
+ * Array of actions to be handled
+ */
+const actions: (()=>void)[] = [];
+
+/**
+ * Add an action to the handler
+ * @param action {()=>void} Action to add to the handler
+ */
+const addAction = (action: () => void) => {
+    actions.push(action);
+};
+
+/**
+ * Handle all actions
+ */
+const handleActions: () => void = () => {
+    actions.forEach(action => action?.());
+};
+
+export { addAction, handleActions };
\ No newline at end of file
diff --git a/src/frontend/js/lib/util/gadsStorage/lib/AppStorage.ts b/src/frontend/js/lib/util/gadsStorage/lib/AppStorage.ts
index ce2bce537..8bcde26d9 100644
--- a/src/frontend/js/lib/util/gadsStorage/lib/AppStorage.ts
+++ b/src/frontend/js/lib/util/gadsStorage/lib/AppStorage.ts
@@ -6,7 +6,7 @@ import { NullStorage } from "./NullStorage";
  */
 export abstract class AppStorage {
     static CreateStorageInstance(): AppStorage {
-        return crypto.subtle ? new GadsStorage(): new NullStorage();
+        return crypto.subtle && typeof crypto.subtle != "undefined" ? new GadsStorage(): new NullStorage();
     }
     /**
      * Store a value in the browsers' storage
diff --git a/src/frontend/js/lib/util/storageProvider/index.ts b/src/frontend/js/lib/util/storageProvider/index.ts
new file mode 100644
index 000000000..d410627a3
--- /dev/null
+++ b/src/frontend/js/lib/util/storageProvider/index.ts
@@ -0,0 +1,3 @@
+import StorageProvider from './lib/storageProvider';
+
+export default StorageProvider;
\ No newline at end of file
diff --git a/src/frontend/js/lib/util/storageProvider/lib/storageProvider.test.ts b/src/frontend/js/lib/util/storageProvider/lib/storageProvider.test.ts
new file mode 100644
index 000000000..e8e98eaf1
--- /dev/null
+++ b/src/frontend/js/lib/util/storageProvider/lib/storageProvider.test.ts
@@ -0,0 +1,68 @@
+import { describe, it, expect, beforeEach } from '@jest/globals';
+import StorageProvider from './storageProvider';
+
+describe('StorageProvider', () => {
+    beforeEach(() => {
+        localStorage.clear();
+    });
+
+    it('should add a key-value pair', async () => {
+        const storage = new StorageProvider('test', localStorage);
+        await expect(storage.setItem('key', 'value')).resolves.toBeUndefined();
+        expect(localStorage.getItem('test')).toBe('{"key":"value"}');
+    });
+
+    it('should get a value by key', async () => {
+        const storage = new StorageProvider('test', localStorage);
+        await expect(storage.setItem('key', 'value')).resolves.toBeUndefined();
+        await expect(storage.getItem('key')).resolves.toBe('value');
+    });
+
+    it('should return undefined if key does not exist', async () => {
+        const storage = new StorageProvider('test', localStorage);
+        await expect(storage.getItem('key')).resolves.toBe(undefined);
+    });
+
+    it('should return all key-value pairs', async () => {
+        const storage = new StorageProvider('test', localStorage);
+        await expect(storage.setItem('key', 'value')).resolves.toBeUndefined();
+        await expect(storage.getAll()).resolves.toEqual({ key: 'value' });
+    });
+
+    it('should return an empty object if no key-value pairs exist', async () => {
+        const storage = new StorageProvider('test', localStorage);
+        await expect(storage.getAll()).resolves.toEqual({});
+    });
+
+    it('should get different values for different instances', async () => {
+        const storage1 = new StorageProvider('test1', localStorage);
+        const storage2 = new StorageProvider('test2', localStorage);
+        await expect(storage1.setItem('key', 'value1')).resolves.toBeUndefined();
+        await expect(storage2.setItem('key', 'value2')).resolves.toBeUndefined();
+        await expect(storage1.getItem('key')).resolves.toBe('value1');
+        await expect(storage2.getItem('key')).resolves.toBe('value2');
+    });
+
+    it('should update a key-value pair', async () => {
+        const storage = new StorageProvider('test', localStorage);
+        await expect(storage.setItem('key', 'value')).resolves.toBeUndefined();
+        await expect(storage.getItem('key')).resolves.toBe('value');
+        await expect(storage.setItem('key', 'new value')).resolves.toBeUndefined();
+        await expect(storage.getItem('key')).resolves.toBe('new value');
+    });
+    
+    it('should remove a key-value pair', async () => {
+        const storage = new StorageProvider('test', localStorage);
+        await expect(storage.setItem('key', 'value')).resolves.toBeUndefined();
+        await expect(storage.getItem('key')).resolves.toBe('value');
+        await expect(storage.removeItem('key')).resolves.toBeUndefined();
+        await expect(storage.getItem('key')).resolves.toBe(undefined);
+    });
+
+    it('should set multipe key value pairs on the same instance', async () => {
+        const storage = new StorageProvider('test', localStorage);
+        await expect(storage.setItem('key1', 'value1')).resolves.toBeUndefined();
+        await expect(storage.setItem('key2', 'value2')).resolves.toBeUndefined();
+        await expect(storage.getAll()).resolves.toEqual({ key1: 'value1', key2: 'value2' });
+    });
+});
diff --git a/src/frontend/js/lib/util/storageProvider/lib/storageProvider.ts b/src/frontend/js/lib/util/storageProvider/lib/storageProvider.ts
new file mode 100644
index 000000000..152215377
--- /dev/null
+++ b/src/frontend/js/lib/util/storageProvider/lib/storageProvider.ts
@@ -0,0 +1,47 @@
+import gadsStorage from "util/gadsStorage";
+import { AppStorage } from "util/gadsStorage/lib/AppStorage";
+import { fromJson } from "util/common"
+
+type StringMap = { [key: string]: string };
+
+class StorageProvider {
+    get provider() {return this.storage;}
+    
+    constructor(private readonly instance: string, private readonly storage:Storage | AppStorage = gadsStorage) {
+    }
+
+    async setItem(key:string, value: string) {
+        let item = await this.storage.getItem(this.instance);
+        if(!item) item = '{}';
+        const map: StringMap = fromJson(item);
+        map[key] = value;
+        await this.storage.setItem(this.instance, JSON.stringify(map));
+    }
+
+    async getItem(key: string): Promise<string| undefined> {
+        const item = await this.storage.getItem(this.instance);
+        if(!item) return undefined;
+        const map: StringMap = fromJson(item);
+        return map[key] || undefined;
+    }
+
+    async getAll(): Promise<StringMap> {
+        const item = await this.storage.getItem(this.instance);
+        if(!item) return {};
+        return fromJson(item);
+    }
+
+    async clear() {
+        this.storage.removeItem(this.instance);
+    }
+
+    async removeItem(key: string) {
+        const item = await this.storage.getItem(this.instance);
+        if(!item) return;
+        const map: StringMap = fromJson(item);
+        delete map[key];
+        await this.storage.setItem(this.instance, JSON.stringify(map));
+    }
+}
+
+export default StorageProvider;
\ No newline at end of file
diff --git a/src/frontend/js/site.js b/src/frontend/js/site.js
index 73dbc0ecb..1517accdf 100644
--- a/src/frontend/js/site.js
+++ b/src/frontend/js/site.js
@@ -3,6 +3,7 @@ import { initializeRegisteredComponents, registerComponent } from 'component';
 import 'bootstrap';
 import 'components/graph/lib/chart';
 import 'util/filedrag';
+import 'util/actionsHandler';
 
 // Components
 import AddTableModalComponent from 'components/modal/modals/new-table';
@@ -42,6 +43,7 @@ import ButtonComponent from "components/button";
 import SelectAllComponent from "components/select-all";
 import HelpView from "components/help-view";
 import PeopleFilterComponent from "components/form-group/people-filter";
+import handleActions from "util/actionsHandler";
 
 // Register them
 registerComponent(AddTableModalComponent);
@@ -84,3 +86,5 @@ registerComponent(AutosaveComponent);
 
 // Initialize all components at some point
 initializeRegisteredComponents(document.body);
+
+handleActions();
\ No newline at end of file
diff --git a/views/layouts/main.tt b/views/layouts/main.tt
index f4af8a0d0..e0347ba63 100755
--- a/views/layouts/main.tt
+++ b/views/layouts/main.tt
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="[% url.css %]/external.css?v=7">
     <link rel="stylesheet" href="[% url.css %]/general.css?v=8">
   </head>
-  <body class="[% body_class || 'page' %]"[% IF csrf_token %] data-csrf="[%- csrf_token -%]"[% END; IF layout OR layout_obj; %] data-layout-identifier="[% layout.identifier || layout_obj.identifier %]"[% END %]>
+  <body class="[% body_class || 'page' %]"[% IF csrf_token %] data-csrf="[%- csrf_token -%]"[% END; IF layout OR layout_obj; %] data-layout-identifier="[% layout.identifier || layout_obj.identifier %]"[% END %][% IF actions; %] data-actions="[% b64_filter(actions) %]"[% END; %]>
     <div class="[% container_class || 'container-fluid' %]">
       [%
         IF page == "login" OR page == "register" OR page == "reset" OR page == "invalidsite";