diff --git a/bin/manage.py b/bin/manage.py
index f032e8c..ebd6f6b 100644
--- a/bin/manage.py
+++ b/bin/manage.py
@@ -19,10 +19,6 @@
 from pymongo import MongoClient
 from pymongo.errors import *
 
-CONSUL_AGENT = os.getenv('CONSUL_AGENT', False)
-CONSUL_HOST = ('localhost' if CONSUL_AGENT else os.getenv('CONSUL', 'consul'))
-
-consul = pyconsul.Consul(host=CONSUL_HOST)
 logging.basicConfig(format='%(asctime)s %(levelname)s %(name)s %(message)s',
                     stream=sys.stdout,
                     level=logging.getLevelName(
@@ -67,6 +63,11 @@ def get_environ(key, default):
 
 # ---------------------------------------------------------
 
+CONSUL_AGENT = bool(get_environ('CONSUL_AGENT', False))
+CONSUL_HOST = ('localhost' if CONSUL_AGENT else get_environ('CONSUL', 'consul'))
+
+consul = pyconsul.Consul(host=CONSUL_HOST)
+
 SESSION_CACHE_FILE = get_environ('SESSION_CACHE_FILE', '/tmp/mongodb-session')
 SESSION_NAME = get_environ('SESSION_NAME', 'mongodb-replica-set-lock')
 SESSION_TTL = int(get_environ('SESSION_TTL', 60))