diff --git a/clearml/backend_api/session/defs.py b/clearml/backend_api/session/defs.py
index cb94e37a..612025d9 100644
--- a/clearml/backend_api/session/defs.py
+++ b/clearml/backend_api/session/defs.py
@@ -12,5 +12,5 @@ ENV_VERBOSE = EnvEntry("CLEARML_API_VERBOSE", "TRAINS_API_VERBOSE", type=bool, d
 ENV_HOST_VERIFY_CERT = EnvEntry("CLEARML_API_HOST_VERIFY_CERT", "TRAINS_API_HOST_VERIFY_CERT",
                                 type=bool, default=True)
 ENV_OFFLINE_MODE = EnvEntry("CLEARML_OFFLINE_MODE", "TRAINS_OFFLINE_MODE", type=bool, converter=safe_text_to_bool)
-ENV_TRAINS_NO_DEFAULT_SERVER = EnvEntry("CLEARML_NO_DEFAULT_SERVER", "TRAINS_NO_DEFAULT_SERVER",
-                                        type=bool, default=False)
+ENV_CLEARML_NO_DEFAULT_SERVER = EnvEntry("CLEARML_NO_DEFAULT_SERVER", "TRAINS_NO_DEFAULT_SERVER",
+                                         converter=safe_text_to_bool, type=bool, default=True)
diff --git a/clearml/backend_api/session/session.py b/clearml/backend_api/session/session.py
index 213cbfe8..945c9d1c 100644
--- a/clearml/backend_api/session/session.py
+++ b/clearml/backend_api/session/session.py
@@ -13,7 +13,7 @@ from six.moves.urllib.parse import urlparse, urlunparse
 from .callresult import CallResult
 from .defs import (
     ENV_VERBOSE, ENV_HOST, ENV_ACCESS_KEY, ENV_SECRET_KEY, ENV_WEB_HOST,
-    ENV_FILES_HOST, ENV_OFFLINE_MODE, ENV_TRAINS_NO_DEFAULT_SERVER, ENV_AUTH_TOKEN, )
+    ENV_FILES_HOST, ENV_OFFLINE_MODE, ENV_CLEARML_NO_DEFAULT_SERVER, ENV_AUTH_TOKEN, )
 from .request import Request, BatchRequest  # noqa: F401
 from .token_manager import TokenManager
 from ..config import load
@@ -152,9 +152,11 @@ class Session(TokenManager):
         if not host:
             raise ValueError("host is required in init or config")
 
-        if ENV_TRAINS_NO_DEFAULT_SERVER.get() and host == self.default_demo_host:
+        if ENV_CLEARML_NO_DEFAULT_SERVER.get() and host == self.default_demo_host:
             raise ValueError(
-                "Configuration file or environment could not be located and default demo server is disabled"
+                "ClearML configuration could not be found (missing `~/clearml.conf` or Environment CLEARML_API_HOST)\n"
+                "To get started with ClearML: setup your own `clearml-server`, "
+                "or create a free account at https://app.community.clear.ml"
             )
 
         self._ssl_error_count_verbosity = self.config.get(
diff --git a/clearml/cli/config/__main__.py b/clearml/cli/config/__main__.py
index ae4c2abf..634abcda 100644
--- a/clearml/cli/config/__main__.py
+++ b/clearml/cli/config/__main__.py
@@ -16,8 +16,8 @@ from clearml.utilities.pyhocon import ConfigFactory, ConfigMissingException
 
 description = "\n" \
     "Please create new clearml credentials through the profile page in " \
-    "your clearml web app (e.g. http://localhost:8080/profile) \n"\
-    "Or with the free hosted service at https://app.community.clear.ml/profile\n" \
+    "your `clearml-server` web app (e.g. http://localhost:8080/profile) \n"\
+    "Or create a free account at https://app.community.clear.ml/profile\n\n" \
     "In the profile page, press \"Create new credentials\", then press \"Copy to clipboard\".\n" \
     "\n" \
     "Paste copied configuration here:\n"
diff --git a/clearml/config/__init__.py b/clearml/config/__init__.py
index 107f8135..a55e30ea 100644
--- a/clearml/config/__init__.py
+++ b/clearml/config/__init__.py
@@ -20,7 +20,7 @@ def get_cache_dir():
     cache_base_dir = Path(  # noqa: F405
         expandvars(
             expanduser(
-                TRAINS_CACHE_DIR.get() or  # noqa: F405
+                CLEARML_CACHE_DIR.get() or  # noqa: F405
                 config.get("storage.cache.default_base_dir") or
                 DEFAULT_CACHE_DIR  # noqa: F405
             )
diff --git a/clearml/config/defs.py b/clearml/config/defs.py
index 68575250..41c30bc4 100644
--- a/clearml/config/defs.py
+++ b/clearml/config/defs.py
@@ -17,7 +17,7 @@ LOG_STDERR_REDIRECT_LEVEL = EnvEntry("CLEARML_LOG_STDERR_REDIRECT_LEVEL", "TRAIN
 DEV_WORKER_NAME = EnvEntry("CLEARML_WORKER_NAME", "TRAINS_WORKER_NAME")
 DEV_TASK_NO_REUSE = EnvEntry("CLEARML_TASK_NO_REUSE", "TRAINS_TASK_NO_REUSE", type=bool)
 TASK_LOG_ENVIRONMENT = EnvEntry("CLEARML_LOG_ENVIRONMENT", "TRAINS_LOG_ENVIRONMENT", type=str)
-TRAINS_CACHE_DIR = EnvEntry("CLEARML_CACHE_DIR", "TRAINS_CACHE_DIR")
+CLEARML_CACHE_DIR = EnvEntry("CLEARML_CACHE_DIR", "TRAINS_CACHE_DIR")
 DEBUG_SIMULATE_REMOTE_TASK = EnvEntry("CLEARML_SIMULATE_REMOTE_TASK", type=bool)
 DEV_DEFAULT_OUTPUT_URI = EnvEntry("CLEARML_DEFAULT_OUTPUT_URI", type=str)