diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx
index e91795b0d..c8e619c05 100644
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -7,17 +7,25 @@ import React from "react";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
 import client from "../utils/GraphQLClient";
 import App from "./App";
+import { useTranslation } from "react-i18next";
 moment.locale("en-US");
 
 if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
 
 export default function AppContainer() {
+  const { t } = useTranslation();
   return (
     <ApolloProvider client={client}>
       <ConfigProvider
         //componentSize="small"
         input={{ autoComplete: "new-password" }}
         locale={enLocale}
+        form={{
+          validateMessages: {
+            // eslint-disable-next-line no-template-curly-in-string
+            required: t("general.validation.required", { label: "${label}" }),
+          },
+        }}
       >
         <GlobalLoadingBar />
         <App />
diff --git a/client/src/components/bill-form/bill-form.component.jsx b/client/src/components/bill-form/bill-form.component.jsx
index 1ce9864b2..8cb3259ce 100644
--- a/client/src/components/bill-form/bill-form.component.jsx
+++ b/client/src/components/bill-form/bill-form.component.jsx
@@ -82,7 +82,7 @@ export function BillFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -104,7 +104,7 @@ export function BillFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -124,7 +124,7 @@ export function BillFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
             ({ getFieldValue }) => ({
               async validator(rule, value) {
@@ -165,7 +165,7 @@ export function BillFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -184,7 +184,7 @@ export function BillFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index afc3eafb5..7006ad0d2 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -50,7 +50,7 @@ export function BillEnterModalLinesComponent({
             rules: [
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ],
           };
@@ -97,7 +97,7 @@ export function BillEnterModalLinesComponent({
             rules: [
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ],
           };
@@ -116,7 +116,7 @@ export function BillEnterModalLinesComponent({
             rules: [
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ],
           };
@@ -137,7 +137,7 @@ export function BillEnterModalLinesComponent({
             rules: [
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ],
           };
@@ -193,7 +193,7 @@ export function BillEnterModalLinesComponent({
             rules: [
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ],
           };
@@ -228,7 +228,7 @@ export function BillEnterModalLinesComponent({
             rules: [
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ],
           };
@@ -286,7 +286,7 @@ export function BillEnterModalLinesComponent({
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                       name={[record.name, "lbr_adjustment", "mod_lbr_ty"]}
@@ -343,7 +343,7 @@ export function BillEnterModalLinesComponent({
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
diff --git a/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table.modal.component.jsx b/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table.modal.component.jsx
index 4fce50ed5..6c7eee52b 100644
--- a/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table.modal.component.jsx
+++ b/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table.modal.component.jsx
@@ -21,7 +21,7 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
       >
diff --git a/client/src/components/config-form-components/checkbox/checkbox.component.jsx b/client/src/components/config-form-components/checkbox/checkbox.component.jsx
index 8b407dc65..cfc8896c3 100644
--- a/client/src/components/config-form-components/checkbox/checkbox.component.jsx
+++ b/client/src/components/config-form-components/checkbox/checkbox.component.jsx
@@ -1,10 +1,9 @@
+import { Checkbox, Form } from "antd";
 import React from "react";
-import { Form, Checkbox } from "antd";
-import { useTranslation } from "react-i18next";
 
 export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
   const { name, label, required } = formItem;
-  const { t } = useTranslation();
+
   return (
     <Form.Item
       name={name}
@@ -13,7 +12,7 @@ export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
       rules={[
         {
           required: required,
-          message: t("general.validation.required"),
+          //message: t("general.validation.required"),
         },
       ]}
     >
diff --git a/client/src/components/config-form-components/rate/rate.component.jsx b/client/src/components/config-form-components/rate/rate.component.jsx
index 6b9d31e73..ae6a2e5c1 100644
--- a/client/src/components/config-form-components/rate/rate.component.jsx
+++ b/client/src/components/config-form-components/rate/rate.component.jsx
@@ -1,10 +1,9 @@
-import React from "react";
 import { Form, Rate } from "antd";
-import { useTranslation } from "react-i18next";
+import React from "react";
 
 export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
   const { name, label, required } = formItem;
-  const { t } = useTranslation();
+
   return (
     <Form.Item
       name={name}
@@ -12,7 +11,7 @@ export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
       rules={[
         {
           required: required,
-          message: t("general.validation.required"),
+          //message: t("general.validation.required"),
         },
       ]}
     >
diff --git a/client/src/components/config-form-components/slider/slider.component.jsx b/client/src/components/config-form-components/slider/slider.component.jsx
index a3b3e7fe4..ba5a665e5 100644
--- a/client/src/components/config-form-components/slider/slider.component.jsx
+++ b/client/src/components/config-form-components/slider/slider.component.jsx
@@ -1,10 +1,9 @@
 import { Form, Slider } from "antd";
 import React from "react";
-import { useTranslation } from "react-i18next";
 
 export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
   const { name, label, required, min, max } = formItem;
-  const { t } = useTranslation();
+
   return (
     <Form.Item
       name={name}
@@ -12,7 +11,7 @@ export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
       rules={[
         {
           required: required,
-          message: t("general.validation.required"),
+          //message: t("general.validation.required"),
         },
       ]}
     >
diff --git a/client/src/components/config-form-components/text/text.component.jsx b/client/src/components/config-form-components/text/text.component.jsx
index 623b73666..981576b31 100644
--- a/client/src/components/config-form-components/text/text.component.jsx
+++ b/client/src/components/config-form-components/text/text.component.jsx
@@ -1,10 +1,8 @@
-import React from "react";
 import { Form, Input } from "antd";
-import { useTranslation } from "react-i18next";
+import React from "react";
 
 export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
   const { name, label, required } = formItem;
-  const { t } = useTranslation();
   return (
     <Form.Item
       name={name}
@@ -12,7 +10,7 @@ export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
       rules={[
         {
           required: required,
-          message: t("general.validation.required"),
+          //message: t("general.validation.required"),
         },
       ]}
     >
diff --git a/client/src/components/config-form-components/textarea/textarea.component.jsx b/client/src/components/config-form-components/textarea/textarea.component.jsx
index d60c58fdc..7ff783543 100644
--- a/client/src/components/config-form-components/textarea/textarea.component.jsx
+++ b/client/src/components/config-form-components/textarea/textarea.component.jsx
@@ -1,10 +1,9 @@
-import React from "react";
 import { Form, Input } from "antd";
-import { useTranslation } from "react-i18next";
+import React from "react";
 
 export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
   const { name, label, required, rows } = formItem;
-  const { t } = useTranslation();
+
   return (
     <Form.Item
       name={name}
@@ -12,7 +11,7 @@ export default function JobIntakeFormCheckboxComponent({ formItem, readOnly }) {
       rules={[
         {
           required: required,
-          message: t("general.validation.required"),
+          //message: t("general.validation.required"),
         },
       ]}
     >
diff --git a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
index 65c296858..68ff74037 100644
--- a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
+++ b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
@@ -314,7 +314,7 @@ export function ContractConvertToRo({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -332,7 +332,7 @@ export function ContractConvertToRo({
           rules={[
             {
               required: bodyshop.enforce_class,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -349,7 +349,7 @@ export function ContractConvertToRo({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={"applyCleanupCharge"}
@@ -364,7 +364,7 @@ export function ContractConvertToRo({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={"refuelqty"}
diff --git a/client/src/components/contract-form/contract-form.component.jsx b/client/src/components/contract-form/contract-form.component.jsx
index dab4dc424..acf1b53fd 100644
--- a/client/src/components/contract-form/contract-form.component.jsx
+++ b/client/src/components/contract-form/contract-form.component.jsx
@@ -35,7 +35,7 @@ export default function ContractFormComponent({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -49,7 +49,7 @@ export default function ContractFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -77,7 +77,7 @@ export default function ContractFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -140,7 +140,7 @@ export default function ContractFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -176,7 +176,7 @@ export default function ContractFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -201,7 +201,7 @@ export default function ContractFormComponent({
                   rules={[
                     {
                       required: true,
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -227,7 +227,7 @@ export default function ContractFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -239,7 +239,7 @@ export default function ContractFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -251,7 +251,7 @@ export default function ContractFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -281,7 +281,7 @@ export default function ContractFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
             ({ getFieldValue }) =>
               PhoneItemFormatterValidation(getFieldValue, "driver_ph1"),
diff --git a/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx b/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx
index d20f98fcc..ac07f4c19 100644
--- a/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx
+++ b/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx
@@ -26,7 +26,7 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
       >
diff --git a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
index 47a51d1ae..78eaa28eb 100644
--- a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
+++ b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
@@ -40,7 +40,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -52,7 +52,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -64,7 +64,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -76,7 +76,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -88,7 +88,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -100,7 +100,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -114,7 +114,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -128,7 +128,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
             ({ getFieldValue }) => ({
               async validator(rule, value) {
@@ -195,7 +195,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -207,7 +207,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -219,7 +219,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -232,7 +232,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -286,7 +286,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -298,7 +298,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx
index 96f30da3f..16124cd0f 100644
--- a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx
+++ b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx
@@ -15,7 +15,7 @@ export default function CourtesyCarReturnModalComponent() {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
       >
@@ -27,7 +27,7 @@ export default function CourtesyCarReturnModalComponent() {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
       >
@@ -39,7 +39,7 @@ export default function CourtesyCarReturnModalComponent() {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
       >
diff --git a/client/src/components/email-overlay/email-overlay.component.jsx b/client/src/components/email-overlay/email-overlay.component.jsx
index 67b902469..0e21bfbb4 100644
--- a/client/src/components/email-overlay/email-overlay.component.jsx
+++ b/client/src/components/email-overlay/email-overlay.component.jsx
@@ -13,7 +13,7 @@ export default function EmailOverlayComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
       >
@@ -28,7 +28,7 @@ export default function EmailOverlayComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
       >
diff --git a/client/src/components/email-test/email-test-component.jsx b/client/src/components/email-test/email-test-component.jsx
index fdb3369ac..57ac80551 100644
--- a/client/src/components/email-test/email-test-component.jsx
+++ b/client/src/components/email-test/email-test-component.jsx
@@ -1,6 +1,5 @@
 import { Button, Form, Input, Select, Switch } from "antd";
 import React from "react";
-import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setEmailOptions } from "../../redux/email/email.actions";
@@ -18,7 +17,6 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function EmailTestComponent({ currentUser, setEmailOptions }) {
   const [form] = Form.useForm();
-  const { t } = useTranslation();
 
   const handleFinish = (values) => {
     console.log("values", values);
@@ -71,7 +69,7 @@ export function EmailTestComponent({ currentUser, setEmailOptions }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
diff --git a/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx b/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx
index c03725a09..fda3aab74 100644
--- a/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx
+++ b/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Form } from "antd";
+import { Form, Space } from "antd";
 import { useTranslation } from "react-i18next";
 import AlertComponent from "../alert/alert.component";
 import { Prompt, useLocation } from "react-router-dom";
@@ -20,9 +20,10 @@ export default function FormsFieldChanged({ form }) {
       style={{ margin: 0, padding: 0, minHeight: "unset" }}
     >
       {() => {
+        const errors = form.getFieldsError().filter((e) => e.errors.length > 0);
         if (form.isFieldsTouched())
           return (
-            <span>
+            <Space direction="vertical" style={{ width: "100%" }}>
               <Prompt
                 when={true}
                 message={(location) => {
@@ -47,7 +48,23 @@ export default function FormsFieldChanged({ form }) {
                   </div>
                 }
               />
-            </span>
+              {errors.length > 0 && (
+                <AlertComponent
+                  type="error"
+                  message={
+                    <div>
+                      <ul>
+                        {errors.map((e, idx) =>
+                          e.errors.map((e2, idx2) => (
+                            <li key={`${idx}${idx2}`}>{e2}</li>
+                          ))
+                        )}
+                      </ul>
+                    </div>
+                  }
+                />
+              )}
+            </Space>
           );
         return <div style={{ display: "none" }}></div>;
       }}
diff --git a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
index 29e9d7a99..5803c0c6f 100644
--- a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
+++ b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
@@ -201,7 +201,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
diff --git a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
index 4bf94686a..ba08a8639 100644
--- a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
+++ b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
@@ -167,7 +167,7 @@ export function JobChecklistForm({
               rules={[
                 {
                   required: true,
-                  message: t("general.validation.required"),
+                  //message: t("general.validation.required"),
                 },
               ]}
             >
@@ -198,7 +198,7 @@ export function JobChecklistForm({
               rules={[
                 {
                   required: true,
-                  message: t("general.validation.required"),
+                  //message: t("general.validation.required"),
                 },
               ]}
             >
diff --git a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
index 44250cca7..24839ac89 100644
--- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
+++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
@@ -46,7 +46,7 @@ export default function JobLinesUpsertModalComponent({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name="line_desc"
diff --git a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
index b9142b0eb..007bcb2cb 100644
--- a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
+++ b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
@@ -53,7 +53,7 @@ export default function ScoreboardAddButton({ job, ...otherBtnProps }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -65,7 +65,7 @@ export default function ScoreboardAddButton({ job, ...otherBtnProps }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -77,7 +77,7 @@ export default function ScoreboardAddButton({ job, ...otherBtnProps }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
diff --git a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
index c6a28667b..05c60be1a 100644
--- a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
+++ b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
@@ -60,7 +60,7 @@ export function JobsAdminClass({ bodyshop, job }) {
           rules={[
             {
               required: bodyshop.enforce_class,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx b/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
index f113cbaab..257b05600 100644
--- a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
+++ b/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
@@ -48,7 +48,7 @@ export default function JobAdminOwnerReassociate({ job }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx b/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx
index 756aac96e..0841d0f16 100644
--- a/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx
+++ b/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx
@@ -48,7 +48,7 @@ export default function JobAdminOwnerReassociate({ job }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
index c2ea5b348..4e4d804c4 100644
--- a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
+++ b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
@@ -108,7 +108,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                         rules={[
                           {
                             required: !!job.joblines[index].act_price,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -141,7 +141,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                         rules={[
                           {
                             required: !!job.joblines[index].mod_lbr_ty,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index 7603f9868..8121ac35c 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -62,7 +62,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -81,7 +81,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO }) {
             rules={[
               {
                 required: bodyshop.enforce_class,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -101,7 +101,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO }) {
             rules={[
               {
                 required: bodyshop.enforce_referral,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
diff --git a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
index 72dae4161..410d2e70e 100644
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
@@ -21,7 +21,7 @@ export default function JobsCreateOwnerInfoNewComponent() {
           rules={[
             {
               required: state.owner.new,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -33,7 +33,7 @@ export default function JobsCreateOwnerInfoNewComponent() {
           rules={[
             {
               required: state.owner.new,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.new.component.jsx b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.new.component.jsx
index 45816d746..aceb28f82 100644
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.new.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.new.component.jsx
@@ -18,7 +18,7 @@ export default function JobsCreateVehicleInfoNewComponent() {
           rules={[
             {
               required: state.vehicle.new,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -32,7 +32,7 @@ export default function JobsCreateVehicleInfoNewComponent() {
           rules={[
             {
               required: state.vehicle.new,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -44,7 +44,7 @@ export default function JobsCreateVehicleInfoNewComponent() {
           rules={[
             {
               required: state.vehicle.new,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -59,7 +59,7 @@ export default function JobsCreateVehicleInfoNewComponent() {
           rules={[
             {
               required: state.vehicle.new,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -71,7 +71,7 @@ export default function JobsCreateVehicleInfoNewComponent() {
           rules={[
             {
               required: state.vehicle.new,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -86,7 +86,7 @@ export default function JobsCreateVehicleInfoNewComponent() {
           rules={[
             {
               required: state.vehicle.new,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -98,7 +98,7 @@ export default function JobsCreateVehicleInfoNewComponent() {
           rules={[
             {
               required: state.vehicle.new,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
index 695f6ae97..83636a094 100644
--- a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
+++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
@@ -69,7 +69,7 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
                 rules={[
                   {
                     required: jobInPostProduction,
-                    message: t("general.validation.required"),
+                    //message: t("general.validation.required"),
                   },
                 ]}
               >
diff --git a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
index 8f209fd0d..0492f6761 100644
--- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
+++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
@@ -96,7 +96,7 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
           rules={[
             {
               required: job.converted && bodyshop.enforce_referral,
-              message: t("general.validation.required"),
+              ////message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx b/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
index 24dd57b34..7fdcf1322 100644
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
@@ -60,7 +60,7 @@ export function JobsDetailRatesParts({
                         "PAA",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -110,7 +110,7 @@ export function JobsDetailRatesParts({
                         "PAC",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -160,7 +160,7 @@ export function JobsDetailRatesParts({
                         "PAL",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -210,7 +210,7 @@ export function JobsDetailRatesParts({
                         "PAG",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -260,7 +260,7 @@ export function JobsDetailRatesParts({
                         "PAM",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -310,7 +310,7 @@ export function JobsDetailRatesParts({
                         "PAN",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -360,7 +360,7 @@ export function JobsDetailRatesParts({
                         "PAO",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -410,7 +410,7 @@ export function JobsDetailRatesParts({
                         "PAP",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -460,7 +460,7 @@ export function JobsDetailRatesParts({
                         "PAR",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -510,7 +510,7 @@ export function JobsDetailRatesParts({
                         "PAS",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -560,7 +560,7 @@ export function JobsDetailRatesParts({
                         "PASL",
                         "prt_tax_in",
                       ]),
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
diff --git a/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx b/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx
index 3a8e66c1b..e55d1233a 100644
--- a/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx
@@ -142,7 +142,7 @@ export function JobsDocumentsGalleryReassign({ bodyshop, galleryImages }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={"jobid"}
diff --git a/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx b/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx
index ed0084e62..8c63e73a2 100644
--- a/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx
+++ b/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx
@@ -70,7 +70,7 @@ export default function LaborAllocationsAdjustmentEdit({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -125,7 +125,7 @@ export default function LaborAllocationsAdjustmentEdit({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
diff --git a/client/src/components/note-upsert-modal/note-upsert-modal.component.jsx b/client/src/components/note-upsert-modal/note-upsert-modal.component.jsx
index 28e824bdd..6d13d0bb0 100644
--- a/client/src/components/note-upsert-modal/note-upsert-modal.component.jsx
+++ b/client/src/components/note-upsert-modal/note-upsert-modal.component.jsx
@@ -36,7 +36,7 @@ export default function NoteUpsertModalComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/owner-detail-form/owner-detail-form.component.jsx b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
index dfee5e070..8dc3772c6 100644
--- a/client/src/components/owner-detail-form/owner-detail-form.component.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
@@ -37,7 +37,7 @@ export default function OwnerDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -52,7 +52,7 @@ export default function OwnerDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -64,7 +64,7 @@ export default function OwnerDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -76,7 +76,7 @@ export default function OwnerDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index 677a84055..c3c51aae4 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -31,7 +31,7 @@ export default function PartsOrderModalComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -46,7 +46,7 @@ export default function PartsOrderModalComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           label={t("parts_orders.fields.deliver_by")}
@@ -79,7 +79,7 @@ export default function PartsOrderModalComponent({
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
diff --git a/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx b/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx
index d02087c40..5f7a851dc 100644
--- a/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx
+++ b/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx
@@ -66,7 +66,7 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
diff --git a/client/src/components/payment-form/payment-form.component.jsx b/client/src/components/payment-form/payment-form.component.jsx
index f6086ef5e..57a3ce4a7 100644
--- a/client/src/components/payment-form/payment-form.component.jsx
+++ b/client/src/components/payment-form/payment-form.component.jsx
@@ -38,7 +38,7 @@ export function PaymentFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -62,7 +62,7 @@ export function PaymentFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -83,7 +83,7 @@ export function PaymentFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -98,7 +98,7 @@ export function PaymentFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -118,7 +118,7 @@ export function PaymentFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/profile-my/profile-my.component.jsx b/client/src/components/profile-my/profile-my.component.jsx
index 00d3cfb6f..5edbab480 100644
--- a/client/src/components/profile-my/profile-my.component.jsx
+++ b/client/src/components/profile-my/profile-my.component.jsx
@@ -33,23 +33,25 @@ export default connect(
       <Form
         onFinish={handleFinish}
         autoComplete={"no"}
-        initialValues={currentUser}>
+        initialValues={currentUser}
+      >
         <Form.Item
           label={t("user.fields.displayname")}
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
-          name='displayName'>
+          name="displayName"
+        >
           <Input />
         </Form.Item>
-        <Form.Item label={t("user.fields.photourl")} name='photoURL'>
+        <Form.Item label={t("user.fields.photourl")} name="photoURL">
           <Input />
         </Form.Item>
 
-        <Button type='primary' key='submit' htmlType='submit'>
+        <Button type="primary" key="submit" htmlType="submit">
           {t("user.actions.updateprofile")}
         </Button>
       </Form>
diff --git a/client/src/components/report-center-modal/report-center-modal.component.jsx b/client/src/components/report-center-modal/report-center-modal.component.jsx
index ac9e395b5..c8423abd6 100644
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -92,7 +92,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -150,7 +150,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
                   rules={[
                     {
                       required: true,
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -167,7 +167,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
                   rules={[
                     {
                       required: true,
-                      message: t("general.validation.required"),
+                      //message: t("general.validation.required"),
                     },
                   ]}
                 >
@@ -185,7 +185,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
index bc695f326..159de69cd 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -72,7 +72,7 @@ export function ScheduleJobModalComponent({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -84,7 +84,7 @@ export function ScheduleJobModalComponent({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
diff --git a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
index 7c34e289a..788f02955 100644
--- a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
+++ b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
@@ -48,7 +48,7 @@ export default function ScoreboardEntryEdit({ entry }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -60,7 +60,7 @@ export default function ScoreboardEntryEdit({ entry }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -72,7 +72,7 @@ export default function ScoreboardEntryEdit({ entry }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/shop-employees/shop-employees-form.component.jsx b/client/src/components/shop-employees/shop-employees-form.component.jsx
index f7f9eeb54..02289e356 100644
--- a/client/src/components/shop-employees/shop-employees-form.component.jsx
+++ b/client/src/components/shop-employees/shop-employees-form.component.jsx
@@ -67,7 +67,7 @@ export function ShopEmployeesFormComponent({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -79,7 +79,7 @@ export function ShopEmployeesFormComponent({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -93,7 +93,7 @@ export function ShopEmployeesFormComponent({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
               ({ getFieldValue }) => ({
                 async validator(rule, value) {
@@ -134,7 +134,7 @@ export function ShopEmployeesFormComponent({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -162,7 +162,7 @@ export function ShopEmployeesFormComponent({
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
           >
@@ -221,7 +221,7 @@ export function ShopEmployeesFormComponent({
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -246,7 +246,7 @@ export function ShopEmployeesFormComponent({
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index f9c337c2b..9f38fb4ff 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -28,7 +28,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -40,7 +40,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -55,7 +55,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -67,7 +67,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -124,7 +124,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["accountingconfig", "tiers"]}
@@ -144,7 +144,7 @@ export default function ShopInfoGeneral({ form }) {
                   {
                     required:
                       form.getFieldValue(["accountingconfig", "tiers"]) === 2,
-                    message: t("general.validation.required"),
+                    //message: t("general.validation.required"),
                   },
                 ]}
                 name={["accountingconfig", "twotierpref"]}
@@ -169,7 +169,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -181,7 +181,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -193,7 +193,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -211,7 +211,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -223,7 +223,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -235,7 +235,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -247,7 +247,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
               type: "array",
             },
           ]}
@@ -260,7 +260,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
               type: "array",
             },
           ]}
@@ -273,7 +273,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
               type: "array",
             },
           ]}
@@ -295,7 +295,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -308,7 +308,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -321,7 +321,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -333,7 +333,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -347,7 +347,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
               type: "array",
             },
           ]}
@@ -367,7 +367,7 @@ export default function ShopInfoGeneral({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -436,7 +436,7 @@ export default function ShopInfoGeneral({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -449,7 +449,7 @@ export default function ShopInfoGeneral({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -501,7 +501,7 @@ export default function ShopInfoGeneral({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -514,7 +514,7 @@ export default function ShopInfoGeneral({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -567,7 +567,7 @@ export default function ShopInfoGeneral({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -620,7 +620,7 @@ export default function ShopInfoGeneral({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
diff --git a/client/src/components/shop-info/shop-info.intake.component.jsx b/client/src/components/shop-info/shop-info.intake.component.jsx
index a6c9a3306..e892a2b55 100644
--- a/client/src/components/shop-info/shop-info.intake.component.jsx
+++ b/client/src/components/shop-info/shop-info.intake.component.jsx
@@ -35,7 +35,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -48,7 +48,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -67,7 +67,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -95,7 +95,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                                 rules={[
                                   {
                                     required: true,
-                                    message: t("general.validation.required"),
+                                    //message: t("general.validation.required"),
                                   },
                                 ]}
                               >
@@ -108,7 +108,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                                 rules={[
                                   {
                                     required: true,
-                                    message: t("general.validation.required"),
+                                    //message: t("general.validation.required"),
                                   },
                                 ]}
                               >
@@ -164,7 +164,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
               type: "array",
             },
           ]}
@@ -197,7 +197,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -211,7 +211,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -231,7 +231,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -263,7 +263,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                                         field.name,
                                         "type",
                                       ]) === "slider",
-                                    message: t("general.validation.required"),
+                                    //message: t("general.validation.required"),
                                   },
                                 ]}
                               >
@@ -281,7 +281,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                                         field.name,
                                         "type",
                                       ]) === "slider",
-                                    message: t("general.validation.required"),
+                                    //message: t("general.validation.required"),
                                   },
                                 ]}
                               >
@@ -335,7 +335,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
               type: "array",
             },
           ]}
diff --git a/client/src/components/shop-info/shop-info.laborrates.component.jsx b/client/src/components/shop-info/shop-info.laborrates.component.jsx
index 1015cad64..0f682e6af 100644
--- a/client/src/components/shop-info/shop-info.laborrates.component.jsx
+++ b/client/src/components/shop-info/shop-info.laborrates.component.jsx
@@ -25,7 +25,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -38,7 +38,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -51,7 +51,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -64,7 +64,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -77,7 +77,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -90,7 +90,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -103,7 +103,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -116,7 +116,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -129,7 +129,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -142,7 +142,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -155,7 +155,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -168,7 +168,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -181,7 +181,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -194,7 +194,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -207,7 +207,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -220,7 +220,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -233,7 +233,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -246,7 +246,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -260,7 +260,7 @@ export default function ShopInfoLaborRates({ form }) {
                       //   rules={[
                       //     {
                       //       required: true,
-                      //       message: t("general.validation.required"),
+                      //       //message: t("general.validation.required"),
                       //     },
                       //   ]}
                       // >
@@ -273,7 +273,7 @@ export default function ShopInfoLaborRates({ form }) {
                       //   rules={[
                       //     {
                       //       required: true,
-                      //       message: t("general.validation.required"),
+                      //       //message: t("general.validation.required"),
                       //     },
                       //   ]}
                       // >
@@ -287,7 +287,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -300,7 +300,7 @@ export default function ShopInfoLaborRates({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
diff --git a/client/src/components/shop-info/shop-info.orderstatus.component.jsx b/client/src/components/shop-info/shop-info.orderstatus.component.jsx
index dcb521387..e489367f8 100644
--- a/client/src/components/shop-info/shop-info.orderstatus.component.jsx
+++ b/client/src/components/shop-info/shop-info.orderstatus.component.jsx
@@ -12,7 +12,7 @@ export default function ShopInfoOrderStatusComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
         name={["md_order_statuses", "default_bo"]}
@@ -24,7 +24,7 @@ export default function ShopInfoOrderStatusComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
         name={["md_order_statuses", "default_ordered"]}
@@ -37,7 +37,7 @@ export default function ShopInfoOrderStatusComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
         name={["md_order_statuses", "default_received"]}
@@ -49,7 +49,7 @@ export default function ShopInfoOrderStatusComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
         ]}
         name={["md_order_statuses", "default_returned"]}
diff --git a/client/src/components/shop-info/shop-info.rbac.component.jsx b/client/src/components/shop-info/shop-info.rbac.component.jsx
index 3aadcf16b..aff4d539e 100644
--- a/client/src/components/shop-info/shop-info.rbac.component.jsx
+++ b/client/src/components/shop-info/shop-info.rbac.component.jsx
@@ -14,7 +14,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "accounting:payables"]}
@@ -26,7 +26,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "accounting:exportlog"]}
@@ -38,7 +38,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "accounting:payments"]}
@@ -50,7 +50,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "accounting:receivables"]}
@@ -62,7 +62,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "csi:page"]}
@@ -74,7 +74,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "csi:export"]}
@@ -86,7 +86,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "contracts:create"]}
@@ -98,7 +98,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "contracts:detail"]}
@@ -110,7 +110,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "contracts:list"]}
@@ -122,7 +122,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "courtesycar:create"]}
@@ -134,7 +134,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "courtesycar:detail"]}
@@ -146,7 +146,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "courtesycar:list"]}
@@ -158,7 +158,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:list-active"]}
@@ -170,7 +170,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:admin"]}
@@ -182,7 +182,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:partsqueue"]}
@@ -194,7 +194,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:list-all"]}
@@ -206,7 +206,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:available-list"]}
@@ -218,7 +218,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:create"]}
@@ -230,7 +230,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:intake"]}
@@ -242,7 +242,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:close"]}
@@ -254,7 +254,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:deliver"]}
@@ -266,7 +266,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:detail"]}
@@ -278,7 +278,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "jobs:checklist-view"]}
@@ -290,7 +290,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "bills:enter"]}
@@ -302,7 +302,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "bills:delete"]}
@@ -314,7 +314,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "bills:view"]}
@@ -326,7 +326,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "bills:list"]}
@@ -338,7 +338,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "employees:page"]}
@@ -350,7 +350,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "owners:list"]}
@@ -362,7 +362,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "owners:detail"]}
@@ -374,7 +374,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "payments:enter"]}
@@ -386,7 +386,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "payments:list"]}
@@ -398,7 +398,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "production:board"]}
@@ -410,7 +410,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "production:list"]}
@@ -422,7 +422,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "schedule:view"]}
@@ -434,7 +434,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "scoreboard:view"]}
@@ -446,7 +446,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "shiftclock:view"]}
@@ -458,7 +458,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "timetickets:edit"]}
@@ -470,7 +470,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "timetickets:shiftedit"]}
@@ -482,7 +482,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "shop:vendors"]}
@@ -494,7 +494,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "shop:rbac"]}
@@ -506,7 +506,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "shop:templates"]}
@@ -518,7 +518,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "timetickets:enter"]}
@@ -530,7 +530,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "timetickets:list"]}
@@ -542,7 +542,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "users:editaccess"]}
@@ -554,7 +554,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "temporarydocs:view"]}
@@ -566,7 +566,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "phonebook:view"]}
@@ -578,7 +578,7 @@ export default function ShopInfoRbacComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_rbac", "phonebook:edit"]}
diff --git a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
index adf0c5d21..2ea9043b3 100644
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -68,7 +68,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -83,7 +83,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -98,7 +98,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -113,7 +113,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -128,7 +128,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -176,7 +176,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -191,7 +191,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -206,7 +206,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -221,7 +221,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -236,7 +236,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -274,7 +274,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "ATS"]}
@@ -292,7 +292,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "LAB"]}
@@ -310,7 +310,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "LAD"]}
@@ -328,7 +328,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "LAE"]}
@@ -346,7 +346,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "LAF"]}
@@ -364,7 +364,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "LAG"]}
@@ -382,7 +382,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "LAM"]}
@@ -400,7 +400,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "LAR"]}
@@ -418,7 +418,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "LAS"]}
@@ -436,7 +436,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "LAU"]}
@@ -454,7 +454,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "PAA"]}
@@ -472,7 +472,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "PAC"]}
@@ -490,7 +490,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "PAL"]}
@@ -508,7 +508,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "PAM"]}
@@ -526,7 +526,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "PAN"]}
@@ -544,7 +544,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "PAO"]}
@@ -562,7 +562,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "PAP"]}
@@ -580,7 +580,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "PAR"]}
@@ -598,7 +598,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "PAS"]}
@@ -616,7 +616,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "TOW"]}
@@ -634,7 +634,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "MAPA"]}
@@ -652,7 +652,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "costs", "MASH"]}
@@ -673,7 +673,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "ATS"]}
@@ -691,7 +691,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "LAB"]}
@@ -709,7 +709,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "LAD"]}
@@ -727,7 +727,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "LAE"]}
@@ -745,7 +745,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "LAF"]}
@@ -763,7 +763,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "LAG"]}
@@ -781,7 +781,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "LAM"]}
@@ -799,7 +799,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "LAR"]}
@@ -817,7 +817,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "LAS"]}
@@ -835,7 +835,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "LAU"]}
@@ -853,7 +853,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "PAA"]}
@@ -871,7 +871,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "PAC"]}
@@ -889,7 +889,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "PAL"]}
@@ -907,7 +907,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "PAM"]}
@@ -925,7 +925,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "PAN"]}
@@ -943,7 +943,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "PAO"]}
@@ -961,7 +961,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "PAP"]}
@@ -979,7 +979,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "PAR"]}
@@ -997,7 +997,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "PAS"]}
@@ -1015,7 +1015,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "TOW"]}
@@ -1033,7 +1033,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "MAPA"]}
@@ -1051,7 +1051,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
             rules={[
               {
                 required: true,
-                message: t("general.validation.required"),
+                //message: t("general.validation.required"),
               },
             ]}
             name={["md_responsibility_centers", "defaults", "profits", "MASH"]}
@@ -1074,7 +1074,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "federal", "name"]}
@@ -1086,7 +1086,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={[
@@ -1103,7 +1103,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={[
@@ -1120,7 +1120,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={[
@@ -1137,7 +1137,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={[
@@ -1154,7 +1154,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "federal", "rate"]}
@@ -1168,7 +1168,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "state", "name"]}
@@ -1180,7 +1180,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={[
@@ -1197,7 +1197,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "state", "accountname"]}
@@ -1209,7 +1209,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "state", "accountdesc"]}
@@ -1221,7 +1221,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "state", "accountitem"]}
@@ -1233,7 +1233,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "state", "rate"]}
@@ -1247,7 +1247,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "local", "name"]}
@@ -1259,7 +1259,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={[
@@ -1276,7 +1276,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "local", "accountname"]}
@@ -1288,7 +1288,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "local", "accountdesc"]}
@@ -1300,7 +1300,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "local", "accountitem"]}
@@ -1312,7 +1312,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "taxes", "local", "rate"]}
@@ -1326,7 +1326,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "ar", "name"]}
@@ -1338,7 +1338,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "ar", "accountnumber"]}
@@ -1350,7 +1350,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "ar", "accountname"]}
@@ -1362,7 +1362,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "ar", "accountdesc"]}
@@ -1374,7 +1374,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "ar", "accountitem"]}
@@ -1388,7 +1388,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "ap", "name"]}
@@ -1400,7 +1400,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "ap", "accountnumber"]}
@@ -1412,7 +1412,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "ap", "accountname"]}
@@ -1424,7 +1424,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "ap", "accountdesc"]}
@@ -1436,7 +1436,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "ap", "accountitem"]}
@@ -1450,7 +1450,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "refund", "name"]}
@@ -1462,7 +1462,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "refund", "accountnumber"]}
@@ -1474,7 +1474,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "refund", "accountname"]}
@@ -1486,7 +1486,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "refund", "accountdesc"]}
@@ -1498,7 +1498,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_responsibility_centers", "refund", "accountitem"]}
@@ -1525,7 +1525,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
@@ -1540,7 +1540,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
diff --git a/client/src/components/shop-info/shop-info.rostatus.component.jsx b/client/src/components/shop-info/shop-info.rostatus.component.jsx
index 68b5e5bdf..28d8a4f1a 100644
--- a/client/src/components/shop-info/shop-info.rostatus.component.jsx
+++ b/client/src/components/shop-info/shop-info.rostatus.component.jsx
@@ -28,7 +28,7 @@ export default function ShopInfoROStatusComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
             type: "array",
           },
         ]}
@@ -41,7 +41,7 @@ export default function ShopInfoROStatusComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
             type: "array",
           },
         ]}
@@ -60,7 +60,7 @@ export default function ShopInfoROStatusComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
             type: "array",
           },
         ]}
@@ -79,7 +79,7 @@ export default function ShopInfoROStatusComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
             type: "array",
           },
         ]}
@@ -98,7 +98,7 @@ export default function ShopInfoROStatusComponent({ form }) {
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
             type: "array",
           },
         ]}
@@ -117,7 +117,7 @@ export default function ShopInfoROStatusComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_ro_statuses", "default_scheduled"]}
@@ -135,7 +135,7 @@ export default function ShopInfoROStatusComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_ro_statuses", "default_arrived"]}
@@ -153,7 +153,7 @@ export default function ShopInfoROStatusComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_ro_statuses", "default_exported"]}
@@ -171,7 +171,7 @@ export default function ShopInfoROStatusComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_ro_statuses", "default_imported"]}
@@ -189,7 +189,7 @@ export default function ShopInfoROStatusComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_ro_statuses", "default_invoiced"]}
@@ -207,7 +207,7 @@ export default function ShopInfoROStatusComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_ro_statuses", "default_completed"]}
@@ -225,7 +225,7 @@ export default function ShopInfoROStatusComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_ro_statuses", "default_delivered"]}
@@ -243,7 +243,7 @@ export default function ShopInfoROStatusComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
           name={["md_ro_statuses", "default_void"]}
diff --git a/client/src/components/shop-info/shop-info.scheduling.component.jsx b/client/src/components/shop-info/shop-info.scheduling.component.jsx
index d9c2b9ba1..7cc29d231 100644
--- a/client/src/components/shop-info/shop-info.scheduling.component.jsx
+++ b/client/src/components/shop-info/shop-info.scheduling.component.jsx
@@ -28,7 +28,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -40,7 +40,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -52,7 +52,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -63,7 +63,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
           label={t("bodyshop.fields.appt_alt_transport")}
           rules={[
             {
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
               type: "array",
             },
           ]}
@@ -138,7 +138,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -151,7 +151,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -203,7 +203,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -216,7 +216,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -230,7 +230,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
@@ -252,7 +252,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
                         rules={[
                           {
                             required: true,
-                            message: t("general.validation.required"),
+                            //message: t("general.validation.required"),
                           },
                         ]}
                       >
diff --git a/client/src/components/shop-info/shop-info.speedprint.component.jsx b/client/src/components/shop-info/shop-info.speedprint.component.jsx
index f10cd95ce..8b857eaec 100644
--- a/client/src/components/shop-info/shop-info.speedprint.component.jsx
+++ b/client/src/components/shop-info/shop-info.speedprint.component.jsx
@@ -24,7 +24,7 @@ export default function ShopInfoSpeedPrint({ bodyshop, form }) {
                     rules={[
                       {
                         required: true,
-                        message: t("general.validation.required"),
+                        //message: t("general.validation.required"),
                       },
                     ]}
                   >
@@ -37,7 +37,7 @@ export default function ShopInfoSpeedPrint({ bodyshop, form }) {
                     rules={[
                       {
                         required: true,
-                        message: t("general.validation.required"),
+                        //message: t("general.validation.required"),
                       },
                     ]}
                   >
@@ -50,7 +50,7 @@ export default function ShopInfoSpeedPrint({ bodyshop, form }) {
                     rules={[
                       {
                         required: true,
-                        message: t("general.validation.required"),
+                        //message: t("general.validation.required"),
                         type: "array",
                       },
                     ]}
diff --git a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
index 1c1da88f1..114dad1f0 100644
--- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
+++ b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
@@ -26,7 +26,7 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -39,7 +39,7 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
index 505d15fb2..0cbd51d18 100644
--- a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
+++ b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
@@ -99,7 +99,7 @@ export function TechClockOffButton({
                     rules={[
                       {
                         required: true,
-                        message: t("general.validation.required"),
+                        //message: t("general.validation.required"),
                       },
                     ]}
                   >
@@ -111,7 +111,7 @@ export function TechClockOffButton({
                     rules={[
                       {
                         required: true,
-                        message: t("general.validation.required"),
+                        //message: t("general.validation.required"),
                       },
                     ]}
                   >
@@ -126,7 +126,7 @@ export function TechClockOffButton({
                 rules={[
                   {
                     required: true,
-                    message: t("general.validation.required"),
+                    //message: t("general.validation.required"),
                   },
                 ]}
               >
diff --git a/client/src/components/tech-login/tech-login.component.jsx b/client/src/components/tech-login/tech-login.component.jsx
index 6aed768bb..502b20cbf 100644
--- a/client/src/components/tech-login/tech-login.component.jsx
+++ b/client/src/components/tech-login/tech-login.component.jsx
@@ -49,7 +49,7 @@ export function TechLogin({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -61,7 +61,7 @@ export function TechLogin({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index c4831c15b..577652485 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -77,7 +77,7 @@ export function TimeTicketModalComponent({
                   required:
                     !form.getFieldValue("cost_center") ===
                     "timetickets.labels.shift",
-                  message: t("general.validation.required"),
+                  //message: t("general.validation.required"),
                 },
               ]}
             >
@@ -91,7 +91,7 @@ export function TimeTicketModalComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -103,7 +103,7 @@ export function TimeTicketModalComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -125,7 +125,7 @@ export function TimeTicketModalComponent({
                 rules={[
                   {
                     required: true,
-                    message: t("general.validation.required"),
+                    //message: t("general.validation.required"),
                   },
                 ]}
               >
@@ -147,7 +147,7 @@ export function TimeTicketModalComponent({
                   required:
                     form.getFieldValue("cost_center") !==
                     "timetickets.labels.shift",
-                  message: t("general.validation.required"),
+                  //message: t("general.validation.required"),
                 },
               ]}
             >
@@ -193,7 +193,7 @@ export function TimeTicketModalComponent({
                   required:
                     !form.getFieldValue("cost_center") ===
                     "timetickets.labels.shift",
-                  message: t("general.validation.required"),
+                  //message: t("general.validation.required"),
                 },
               ]}
             >
diff --git a/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx
index 6bd25a2ea..9416dc27d 100644
--- a/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx
+++ b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx
@@ -18,28 +18,29 @@ export function TimeTicketShiftFormComponent({ bodyshop, form }) {
   return (
     <div>
       <Form.Item
-        name='memo'
+        name="memo"
         label={t("timetickets.fields.memo")}
         rules={[
           {
             required: true,
-            message: t("general.validation.required"),
+            //message: t("general.validation.required"),
           },
-        ]}>
+        ]}
+      >
         <Select>
-          <Select.Option value='timetickets.labels.amshift'>
+          <Select.Option value="timetickets.labels.amshift">
             {t("timetickets.labels.amshift")}
           </Select.Option>
-          <Select.Option value='timetickets.labels.ambreak'>
+          <Select.Option value="timetickets.labels.ambreak">
             {t("timetickets.labels.ambreak")}
           </Select.Option>
-          <Select.Option value='timetickets.labels.lunch'>
+          <Select.Option value="timetickets.labels.lunch">
             {t("timetickets.labels.lunch")}
           </Select.Option>
-          <Select.Option value='timetickets.labels.pmshift'>
+          <Select.Option value="timetickets.labels.pmshift">
             {t("timetickets.labels.pmshift")}
           </Select.Option>
-          <Select.Option value='timetickets.labels.pmbreak'>
+          <Select.Option value="timetickets.labels.pmbreak">
             {t("timetickets.labels.pmbreak")}
           </Select.Option>
         </Select>
diff --git a/client/src/components/user-request-pw-reset/user-request-reset-pw.component.jsx b/client/src/components/user-request-pw-reset/user-request-reset-pw.component.jsx
index 62e8bc145..aac56a0b4 100644
--- a/client/src/components/user-request-pw-reset/user-request-reset-pw.component.jsx
+++ b/client/src/components/user-request-pw-reset/user-request-reset-pw.component.jsx
@@ -68,7 +68,7 @@ export function UserRequestResetPw({
             {
               type: "email",
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx b/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
index a6b05bd6d..8dc5853cf 100644
--- a/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
+++ b/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
@@ -86,7 +86,7 @@ export function UserValidatePwReset({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -103,7 +103,7 @@ export function UserValidatePwReset({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
             ({ getFieldValue }) => ({
               validator(rule, value) {
diff --git a/client/src/components/vehicle-detail-form/vehicle-detail-form.component.jsx b/client/src/components/vehicle-detail-form/vehicle-detail-form.component.jsx
index 91657fcf4..be0cb80b8 100644
--- a/client/src/components/vehicle-detail-form/vehicle-detail-form.component.jsx
+++ b/client/src/components/vehicle-detail-form/vehicle-detail-form.component.jsx
@@ -19,7 +19,7 @@ export default function VehicleDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -31,7 +31,7 @@ export default function VehicleDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -43,7 +43,7 @@ export default function VehicleDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -55,7 +55,7 @@ export default function VehicleDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -67,7 +67,7 @@ export default function VehicleDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -82,7 +82,7 @@ export default function VehicleDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
@@ -94,7 +94,7 @@ export default function VehicleDetailFormComponent({ form, loading }) {
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
           ]}
         >
diff --git a/client/src/components/vendors-form/vendors-form.component.jsx b/client/src/components/vendors-form/vendors-form.component.jsx
index ca512cb3c..d9ab9b483 100644
--- a/client/src/components/vendors-form/vendors-form.component.jsx
+++ b/client/src/components/vendors-form/vendors-form.component.jsx
@@ -71,7 +71,7 @@ export default function VendorsFormComponent({
           rules={[
             {
               required: true,
-              message: t("general.validation.required"),
+              //message: t("general.validation.required"),
             },
             ({ getFieldValue }) => ({
               async validator(rule, value) {
@@ -189,7 +189,7 @@ export default function VendorsFormComponent({
                       rules={[
                         {
                           required: true,
-                          message: t("general.validation.required"),
+                          //message: t("general.validation.required"),
                         },
                       ]}
                     >
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 64f8559e9..8027d1a4a 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -870,7 +870,7 @@
 			"validation": {
 				"invalidemail": "Please enter a valid email.",
 				"invalidphone": "Please enter a valid phone number.",
-				"required": "This field is required. "
+				"required": "{{label}} is required. "
 			}
 		},
 		"help": {