diff --git a/templates/cli/app/services/client.php.twig b/templates/cli/app/services/client.php.twig
index 928a1b310..2cb9167b0 100644
--- a/templates/cli/app/services/client.php.twig
+++ b/templates/cli/app/services/client.php.twig
@@ -63,6 +63,7 @@ $cli
 
 
 {% for header in spec.global.headers %}
+{%if header.key != 'JWT' %}
 $cli
     ->task('set{{ header.key }}')
     ->param('{{ header.key | lower }}', '', new Wildcard(), '{{ header.description }}', false)
@@ -75,7 +76,7 @@ $cli
             Console::success('✅ Preferences saved successfully');
         }
     });
-
+{% endif %}
 {% endfor %}
 
 $cli
diff --git a/templates/cli/app/services/init.php.twig b/templates/cli/app/services/init.php.twig
index 35ac897df..27d3a4324 100644
--- a/templates/cli/app/services/init.php.twig
+++ b/templates/cli/app/services/init.php.twig
@@ -21,7 +21,7 @@ const PREFERENCE_ENDPOINT = "endpoint";
 $preferences = [
     PREFERENCE_ENDPOINT => '',
 {% for header in spec.global.headers %}
-{% if header.key != 'Mode' %}
+{% if header.key != 'Mode' and header.key != 'JWT' %}
     '{{header.name}}' => '',
 {% endif %}
 {% endfor %}
@@ -40,7 +40,7 @@ function loadEnvVariables(): bool
         setPreference(PREFERENCE_ENDPOINT, $endpoint);
 
 {% for header in spec.global.headers %}
-{% if header.key != 'Mode' %}
+{% if header.key != 'Mode' and header.key != 'JWT' %}
         ${{ header.key | caseCamel }} = getenv('{{ header.name}}') ?: '';
         setPreference('{{ header.name }}', ${{ header.key | caseCamel }});
 
@@ -68,7 +68,7 @@ function loadEnvVariables(): bool
 function isPreferenceLoaded() : bool {
     if(empty(getPreference(PREFERENCE_ENDPOINT))) return false;
 {% for header in spec.global.headers %}
-{% if header.key != 'Mode' %}
+{% if header.key != 'Mode' and header.key != 'JWT' %}
     if(empty(getPreference('{{header.name}}'))) return false;
 {% endif %}
 {% endfor %}
@@ -167,20 +167,24 @@ $cli->
 
 $cli
     ->task('init')
-    ->label('description', "The init command is used to initialise your CLI\n")
+    ->label('description', "The init command is used to initialize your CLI\n")
     ->param('endpoint', '', new Wildcard(), 'Your {{ spec.title | caseUcfirst }} endpoint', true)
 {% for header in spec.global.headers %}
+{% if header.key != 'JWT' %}
     ->param('{{ header.key | lower }}', '', new Wildcard(), '{{ header.description }}', true)
+{% endif %}
 {% endfor %}
-    ->action(function( $endpoint, {% for header in spec.global.headers %} ${{ header.key | lower }}{% if not loop.last %},{% endif %}{% endfor %} ) {
+    ->action(function( $endpoint,{% for header in spec.global.headers %}{% if header.key != 'JWT' %} ${{ header.key | lower }}{% if not loop.last %},{% endif %}{% endif %}{% endfor %} ) {
         /* 
-        * Check if enviroment variables exist
+        * Check if environment variables exist
         * Else prompt the user
         */
         
         putenv("endpoint=$endpoint");
 {% for header in spec.global.headers %}
+{% if header.key != 'JWT' %}
         putenv("{{ header.name }}=${{ header.key | lower }}");
+{% endif %}
 {% endfor %}
 
         if (!loadEnvVariables()) {
diff --git a/templates/cli/install.sh.twig b/templates/cli/install.sh.twig
index 3f196fe89..c729b785b 100644
--- a/templates/cli/install.sh.twig
+++ b/templates/cli/install.sh.twig
@@ -116,8 +116,7 @@ install() {
     fi
     printSuccess
     
-    echo '
-#!/bin/bash
+    echo '#!/bin/bash
 
 allowList=(help init client{% for service in spec.services %} {{ service.name }}{% endfor %})
 
diff --git a/templates/cli/src/Client.php.twig b/templates/cli/src/Client.php.twig
index 57222b372..701ab388a 100644
--- a/templates/cli/src/Client.php.twig
+++ b/templates/cli/src/Client.php.twig
@@ -44,7 +44,7 @@ class Client
         self::PREFERENCE_ENDPOINT => '',
         self::PREFERENCE_SELF_SIGNED => '',
 {% for header in spec.global.headers %}
-{% if header.key != 'Mode' %}
+{% if header.key != 'Mode' and header.key != 'JWT' %}
         '{{header.name}}' => '',
 {% endif %}
 {% endfor %}
@@ -61,7 +61,7 @@ class Client
         }
         $this
 {% for header in spec.global.headers %}
-{% if header.key != 'Mode' %}
+{% if header.key != 'Mode' and header.key != 'JWT' %}
             ->set{{header.key | caseUcfirst}}($this->preferences['{{header.name}}'])
 {% endif %}
 {% endfor %}
@@ -140,15 +140,15 @@ class Client
     private function isPreferenceLoaded() : bool {
         if(empty($this->getPreference(self::PREFERENCE_ENDPOINT))) return false;
 {% for header in spec.global.headers %}
-{% if header.key != 'Mode' %}
+{% if header.key != 'Mode' and header.key != 'JWT' %}
         if(empty($this->getPreference('{{header.name}}'))) return false;
 {% endif %}
 {% endfor %}
         return true;
     }
 
-
 {% for header in spec.global.headers %}
+{% if header.key != 'JWT' %}
     /**
      * Set {{header.key | caseUcfirst}}
      *
@@ -163,13 +163,11 @@ class Client
     public function set{{header.key | caseUcfirst}}($value)
     {
         $this->addHeader('{{header.name}}', $value);
-
         return $this;
     }
 
+{% endif %}
 {% endfor %}
-
-
     /**
      * @param $key
      * @param $value