diff --git a/manual_tests/client.js b/manual_tests/client.js
index 6d33d521..0fe73b90 100644
--- a/manual_tests/client.js
+++ b/manual_tests/client.js
@@ -7,15 +7,15 @@ let options = {};
 const signature = process.env.SIGNATURE || null;
 const policy = process.env.POLICY || null;
 const cname = process.env.CNAME || null;
-const securityEnabled = process.env.SECURITY_ENABLED || false;
+const securityEnabled = process.env.SECURITY_ENABLED || (policy && signature)  || false;
 
 console.info(`FILESTACK-JS VERSION::::::: ${filestack.version}`)
 
-if (!signature || !policy) {
-  throw new Error('Signature and Policy are always required')
-}
-
 if (securityEnabled) {
+  if (!signature || !policy) {
+    throw new Error('Signature and Policy are always required')
+  }
+
   options.security = {
     signature,
     policy
diff --git a/src/schema/definitions.schema.ts b/src/schema/definitions.schema.ts
index 919500d9..a7b1d8ea 100644
--- a/src/schema/definitions.schema.ts
+++ b/src/schema/definitions.schema.ts
@@ -62,8 +62,9 @@ export const DefinitionsSchema = {
     regionsDef: {
       id: '/regionsDef',
       type: 'string',
-      pattern: '^[a-zA-Z]{2}-[a-zA-z]{1,}-[1-9]$',
-      errorMessage: 'AWS Region Param is in invalid format',
+      // for now we decided to remove validation of regions (AWS + Rackspace)
+      // pattern: '^[a-zA-Z]{2}-[a-zA-z]{1,}-[1-9]$',
+      // errorMessage: 'AWS Region Param is in invalid format',
     },
     locationsDef: {
       id: '/locationsDef',