diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index b5c45b4..445e766 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -15,7 +15,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
   return (
     <>
       <HighlightInit
-        // excludedHostnames={['localhost']}
+        excludedHostnames={['localhost']}
         projectId={CONSTANTS.NEXT_PUBLIC_HIGHLIGHT_PROJECT_ID}
         serviceName='credit-app'
         tracingOrigins
diff --git a/src/components/sections/Employment/JointEmployee.tsx b/src/components/sections/Employment/JointEmployee.tsx
index a89dd1b..34e0f4a 100644
--- a/src/components/sections/Employment/JointEmployee.tsx
+++ b/src/components/sections/Employment/JointEmployee.tsx
@@ -40,9 +40,9 @@ export default function JointEmployee() {
                   <InputField
                     {...register('co_employerName', {
                       required: 'Required',
-                      maxLength: { value: 50, message: 'Max 50 chars' },
+                      maxLength: { value: 40, message: 'Max 40 chars' },
                     })}
-                    maxLength={50}
+                    maxLength={40}
                     errormsg={errors?.co_employerName?.message!}
                     variant='sm:col-span-6 whitespace-nowrap'
                     placeholder='ABC Company'
@@ -114,9 +114,9 @@ export default function JointEmployee() {
                 <InputField
                   {...register('co_previousEmployerName', {
                     required: 'Required',
-                    maxLength: { value: 50, message: 'Max 50 chars' },
+                    maxLength: { value: 40, message: 'Max 40 chars' },
                   })}
-                  maxLength={50}
+                  maxLength={40}
                   errormsg={errors?.co_previousEmployerName?.message!}
                   variant='sm:col-span-6 whitespace-nowrap'
                   placeholder='ABC Company'
diff --git a/src/components/sections/Employment/PrimaryEmployee.tsx b/src/components/sections/Employment/PrimaryEmployee.tsx
index 8c005a9..f85dacd 100644
--- a/src/components/sections/Employment/PrimaryEmployee.tsx
+++ b/src/components/sections/Employment/PrimaryEmployee.tsx
@@ -39,9 +39,9 @@ export default function PrimaryEmployee() {
                   <InputField
                     {...register('employerName', {
                       required: 'Required',
-                      maxLength: { value: 50, message: 'Max 50 chars' },
+                      maxLength: { value: 40, message: 'Max 40 chars' },
                     })}
-                    maxLength={50}
+                    maxLength={40}
                     errormsg={errors?.employerName?.message!}
                     variant='sm:col-span-6 whitespace-nowrap'
                     placeholder='ABC Company'
@@ -113,9 +113,9 @@ export default function PrimaryEmployee() {
                 <InputField
                   {...register('previousEmployerName', {
                     required: 'Required',
-                    maxLength: { value: 50, message: 'Max 50 chars' },
+                    maxLength: { value: 40, message: 'Max 40 chars' },
                   })}
-                  maxLength={50}
+                  maxLength={40}
                   errormsg={errors?.previousEmployerName?.message!}
                   variant='sm:col-span-6 whitespace-nowrap'
                   placeholder='ABC Company'