diff --git a/new-lamassu-admin/src/pages/AddMachine/AddMachine.js b/new-lamassu-admin/src/pages/AddMachine/AddMachine.js
index 5cc36b47..f74deff2 100644
--- a/new-lamassu-admin/src/pages/AddMachine/AddMachine.js
+++ b/new-lamassu-admin/src/pages/AddMachine/AddMachine.js
@@ -125,7 +125,11 @@ const validationSchema = Yup.object().shape({
     .test(
       'unique-name',
       'Machine name is already in use.',
-      (value, context) => !context.options.context.machineNames.includes(value)
+      (value, context) =>
+        !R.any(
+          it => R.equals(R.toLower(it), R.toLower(value)),
+          context.options.context.machineNames
+        )
     )
 })
 
diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js
index 991f65f7..9450b432 100644
--- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js
+++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js
@@ -34,8 +34,8 @@ const validationSchema = existingRequirements =>
         'unique-name',
         'A custom information requirement with that name already exists',
         (value, _context) =>
-          !R.includes(
-            value,
+          !R.any(
+            it => R.equals(R.toLower(it), R.toLower(value)),
             R.map(it => it.customRequest.name, existingRequirements)
           )
       )