diff --git a/frontend/src/Components/Form/FormInputGroup.tsx b/frontend/src/Components/Form/FormInputGroup.tsx
index c23b895c63..d1fbe04588 100644
--- a/frontend/src/Components/Form/FormInputGroup.tsx
+++ b/frontend/src/Components/Form/FormInputGroup.tsx
@@ -254,14 +254,7 @@ function FormInputGroup<T>(props: FormInputGroupProps<T>) {
       {helpLink ? <Link to={helpLink}>{translate('MoreInfo')}</Link> : null}
 
       {errors.map((error, index) => {
-        return 'message' in error ? (
-          <FormInputHelpText
-            key={index}
-            text={error.message}
-            isError={true}
-            isCheckInput={checkInput}
-          />
-        ) : (
+        return 'errorMessage' in error ? (
           <FormInputHelpText
             key={index}
             text={error.errorMessage}
@@ -270,23 +263,30 @@ function FormInputGroup<T>(props: FormInputGroupProps<T>) {
             isError={true}
             isCheckInput={checkInput}
           />
+        ) : (
+          <FormInputHelpText
+            key={index}
+            text={error.message}
+            isError={true}
+            isCheckInput={checkInput}
+          />
         );
       })}
 
       {warnings.map((warning, index) => {
-        return 'message' in warning ? (
+        return 'errorMessage' in warning ? (
           <FormInputHelpText
             key={index}
-            text={warning.message}
+            text={warning.errorMessage}
+            link={warning.infoLink}
+            tooltip={warning.detailedDescription}
             isWarning={true}
             isCheckInput={checkInput}
           />
         ) : (
           <FormInputHelpText
             key={index}
-            text={warning.errorMessage}
-            link={warning.infoLink}
-            tooltip={warning.detailedDescription}
+            text={warning.message}
             isWarning={true}
             isCheckInput={checkInput}
           />