diff --git a/.eslintrc.json b/.eslintrc.json
index fc2e61de..71ad65b3 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -34,7 +34,7 @@
     "import/no-cycle": "error",
     "no-unused-vars": "off",
     "linebreak-style": ["error", "unix"],
-    "quotes": ["error", "single"],
+    "quotes": ["error", "single", { "avoidEscape": true }],
     "semi": ["error", "always"],
     "no-console": ["error", { "allow": ["info", "warn", "error"] }],
     "unused-imports/no-unused-imports-ts": "error",
diff --git a/src/scripts/add-user-to-group.ts b/src/scripts/add-user-to-group.ts
index ba3cd5a1..49b2c48c 100644
--- a/src/scripts/add-user-to-group.ts
+++ b/src/scripts/add-user-to-group.ts
@@ -76,13 +76,11 @@ export default (
         .option('user-id', {
           type: 'string',
           alias: ['user-login', 'user-email', 'user'],
-          // eslint-disable-next-line quotes
           describe: "The user's ID, login, or email address",
           demandOption: true,
         })
         .option('group', {
           type: 'string',
-          // eslint-disable-next-line quotes
           describe: "The group's ID",
           demandOption: true,
         });
diff --git a/src/scripts/create-user.ts b/src/scripts/create-user.ts
index 9576c4ec..fe7f46cf 100644
--- a/src/scripts/create-user.ts
+++ b/src/scripts/create-user.ts
@@ -63,21 +63,18 @@ export default (
         .option('email', {
           type: 'string',
           alias: ['login'],
-          // eslint-disable-next-line quotes
           describe: "The new user's login/email",
           demandOption: true,
         })
         .option('fname', {
           type: 'string',
           alias: ['first-name'],
-          // eslint-disable-next-line quotes
           describe: "The new user's first name",
           demandOption: true,
         })
         .option('lname', {
           type: 'string',
           alias: ['last-name'],
-          // eslint-disable-next-line quotes
           describe: "The new user's last name",
           demandOption: true,
         });
diff --git a/src/scripts/list-groups.ts b/src/scripts/list-groups.ts
index e31ae673..3eb37f8d 100644
--- a/src/scripts/list-groups.ts
+++ b/src/scripts/list-groups.ts
@@ -90,7 +90,6 @@ type ListGroupsOptions = {
 export default (rootCommand: RootCommand): Argv<ListGroupsOptions> =>
   rootCommand.command(
     'list-groups',
-    // eslint-disable-next-line quotes
     "Provides a list of all groups' IDs, email addresses, display names, and statuses. Allows a specification of a user ID to list only groups that the user is a member of.",
     // eslint-disable-next-line functional/no-return-void, @typescript-eslint/prefer-readonly-parameter-types
     (yargs) => {
@@ -98,7 +97,6 @@ export default (rootCommand: RootCommand): Argv<ListGroupsOptions> =>
       yargs.positional('user', {
         type: 'string',
         alias: ['user-id'],
-        // eslint-disable-next-line quotes
         describe: "The user's ID",
       });
     },
diff --git a/src/scripts/list-users.ts b/src/scripts/list-users.ts
index f2ae2c68..d50c5e8d 100644
--- a/src/scripts/list-users.ts
+++ b/src/scripts/list-users.ts
@@ -90,7 +90,6 @@ export default (
         .positional('group', {
           type: 'string',
           alias: ['group-id'],
-          // eslint-disable-next-line quotes
           describe: "The group's ID",
         })
         .option('all', {
diff --git a/src/scripts/ping.ts b/src/scripts/ping.ts
index 6899dd1d..1319d467 100644
--- a/src/scripts/ping.ts
+++ b/src/scripts/ping.ts
@@ -67,7 +67,6 @@ export default (
 }> =>
   rootCommand.command(
     'ping',
-    // eslint-disable-next-line quotes
     "Pings the okta server to see if it's running and check user credentials along with organisation url",
     // eslint-disable-next-line functional/no-return-void, functional/functional-parameters, @typescript-eslint/no-empty-function
     () => {},
diff --git a/src/scripts/remove-user-from-group.ts b/src/scripts/remove-user-from-group.ts
index 63e805a0..c96e542e 100644
--- a/src/scripts/remove-user-from-group.ts
+++ b/src/scripts/remove-user-from-group.ts
@@ -81,13 +81,11 @@ export default (
         .option('user-id', {
           type: 'string',
           alias: ['user-login', 'user-email', 'user'],
-          // eslint-disable-next-line quotes
           describe: "The user's ID, login, or email address",
           demandOption: true,
         })
         .option('group', {
           type: 'string',
-          // eslint-disable-next-line quotes
           describe: "The group's ID",
           demandOption: true,
         });