diff --git a/e6_benchmarks/base_benchmarks.py b/e6_benchmarks/base_benchmarks.py
index f0485be..7c76654 100644
--- a/e6_benchmarks/base_benchmarks.py
+++ b/e6_benchmarks/base_benchmarks.py
@@ -17,8 +17,8 @@
 
 cluster_host = os.environ.get("HOST")
 cluster_port = int(os.environ.get("PORT"))
-username = os.environ.get("USERNAME")
-password = os.environ.get("PASSWORD")
+username = os.environ.get("E6_USERNAME")
+password = os.environ.get("E6_PASSWORD")
 concurrent_query_count = os.environ.get("CONCURRENT_QUERY_COUNT")
 concurrency_interval = os.environ.get("CONCURRENCY_INTERVAL")
 catalog = os.environ.get("CATALOG")
diff --git a/e6_benchmarks/base_benchmarks_v2.py b/e6_benchmarks/base_benchmarks_v2.py
index 3c1e622..cc8707f 100644
--- a/e6_benchmarks/base_benchmarks_v2.py
+++ b/e6_benchmarks/base_benchmarks_v2.py
@@ -16,8 +16,8 @@
 
 cluster_host = os.environ.get("HOST")
 cluster_port = int(os.environ.get("PORT"))
-username = os.environ.get("USERNAME")
-password = os.environ.get("PASSWORD")
+username = os.environ.get("E6_USERNAME")
+password = os.environ.get("E6_PASSWORD")
 concurrent_query_count = os.environ.get("CONCURRENT_QUERY_COUNT")
 concurrency_interval = os.environ.get("CONCURRENCY_INTERVAL")
 catalog = os.environ.get("CATALOG")
@@ -573,6 +573,8 @@ def _send_to_webclient(self, result):
     logger.info('Engin IP is {}'.format(cluster_host))
     logger.info('Engin Port is {}'.format(cluster_port))
     logger.info('Query Path is {}'.format(query_path))
+    logger.info('Username is {}'.format(username))
+    logger.info('Password is {}'.format(password))
     logger.info(
         'CONCURRENT_QUERY_COUNT {}, with CONCURRENCY_INTERVAL {}'.format(concurrent_query_count, concurrency_interval))
     a = threading.Thread(args=(5,))