diff --git a/kloudbuster/kloudbuster.py b/kloudbuster/kloudbuster.py
index ec732ab..63351f0 100755
--- a/kloudbuster/kloudbuster.py
+++ b/kloudbuster/kloudbuster.py
@@ -40,7 +40,7 @@ from kb_runner_storage import KBRunner_Storage
 from kb_scheduler import KBScheduler
 
 import keystoneauth1
-from keystoneclient.v2_0 import client as keystoneclient
+from keystoneclient import client as keystoneclient
 
 import log as logging
 from neutronclient.neutron import client as neutronclient
diff --git a/kloudbuster/tenant.py b/kloudbuster/tenant.py
index 1633117..814d070 100644
--- a/kloudbuster/tenant.py
+++ b/kloudbuster/tenant.py
@@ -68,7 +68,7 @@ class Tenant(object):
             LOG.info("Creating tenant: " + self.tenant_name)
             tenant_object = \
                 self.tenant_api.create(self.tenant_name,
-                                       # domain="default",
+                                       domain="default",
                                        description="KloudBuster tenant",
                                        enabled=True)
             return tenant_object