diff --git a/client/src/components/Form/FormGeneric.vue b/client/src/components/Form/FormGeneric.vue
index 623c2ca244b..781c29f7551 100644
--- a/client/src/components/Form/FormGeneric.vue
+++ b/client/src/components/Form/FormGeneric.vue
@@ -72,6 +72,10 @@ export default {
             type: String,
             default: null,
         },
+        trimInputs: {
+            type: Boolean,
+            default: false,
+        },
     },
     data() {
         return {
@@ -103,7 +107,18 @@ export default {
             window.location = withPrefix(this.cancelRedirect);
         },
         onSubmit() {
-            submitData(this.url, this.formData).then((response) => {
+            const formData = { ...this.formData };
+
+            if (this.trimInputs) {
+                // Trim string values in form data
+                Object.keys(formData).forEach((key) => {
+                    if (typeof formData[key] === "string") {
+                        formData[key] = formData[key].trim();
+                    }
+                });
+            }
+
+            submitData(this.url, formData).then((response) => {
                 let params = {};
                 if (response.id) {
                     params.id = response.id;
diff --git a/client/src/components/User/UserPreferencesForm.vue b/client/src/components/User/UserPreferencesForm.vue
index 4f1dd46e719..047289d549f 100644
--- a/client/src/components/User/UserPreferencesForm.vue
+++ b/client/src/components/User/UserPreferencesForm.vue
@@ -1,5 +1,5 @@
 <template>
-    <FormGeneric v-bind="formConfig" />
+    <FormGeneric v-bind="formConfig" :trim-inputs="true" />
 </template>
 <script>
 import FormGeneric from "components/Form/FormGeneric";