diff --git a/api/chalicelib/core/integration_jira_cloud.py b/api/chalicelib/core/integration_jira_cloud.py
index 65bad1e4a..8caf22832 100644
--- a/api/chalicelib/core/integration_jira_cloud.py
+++ b/api/chalicelib/core/integration_jira_cloud.py
@@ -1,6 +1,6 @@
-from chalicelib.utils import pg_client, helper
-from chalicelib.core.integration_jira_cloud_issue import JIRACloudIntegrationIssue
 from chalicelib.core import integration_base
+from chalicelib.core.integration_jira_cloud_issue import JIRACloudIntegrationIssue
+from chalicelib.utils import pg_client, helper
 
 PROVIDER = "JIRA"
 
@@ -89,7 +89,9 @@ class JIRAIntegration(integration_base.BaseIntegration):
             return self.update(
                 changes={
                     "username": data["username"],
-                    "token": data["token"],
+                    "token": data["token"] \
+                        if data.get("token") and len(data["token"]) > 0 and data["token"].find("***") == -1 \
+                        else s["token"],
                     "url": data["url"]
                 }
             )
diff --git a/api/chalicelib/utils/jira_client.py b/api/chalicelib/utils/jira_client.py
index a7ab92932..d3b637373 100644
--- a/api/chalicelib/utils/jira_client.py
+++ b/api/chalicelib/utils/jira_client.py
@@ -1,8 +1,9 @@
-from jira import JIRA
-from jira.exceptions import JIRAError
 import time
 from datetime import datetime
+
 import requests
+from jira import JIRA
+from jira.exceptions import JIRAError
 from requests.auth import HTTPBasicAuth
 
 fields = "id, summary, description, creator, reporter, created, assignee, status, updated, comment, issuetype, labels"
@@ -15,7 +16,11 @@ class JiraManager:
     def __init__(self, url, username, password, project_id=None):
         self._config = {"JIRA_PROJECT_ID": project_id, "JIRA_URL": url, "JIRA_USERNAME": username,
                         "JIRA_PASSWORD": password}
-        self._jira = JIRA({'server': url}, basic_auth=(username, password), logging=True)
+        try:
+            self._jira = JIRA({'server': url}, basic_auth=(username, password), logging=True, max_retries=1)
+        except Exception as e:
+            print("!!! JIRA AUTH ERROR")
+            print(e)
 
     def set_jira_project_id(self, project_id):
         self._config["JIRA_PROJECT_ID"] = project_id