diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index 13362fba..a88938ce 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -79,6 +79,7 @@ SECRET_KEY = env('DJANGO_SECRET_KEY')
 
 INSTALLED_APPS = (
     # 1st migrate
+    'hosting',
     'membership',
     'djangocms_admin_style',
     'django.contrib.auth',
@@ -143,7 +144,6 @@ INSTALLED_APPS = (
     # ungleich
     'ungleich',
     'ungleich_page',
-    'hosting',
     'digitalglarus',
     'nosystemd',
     'datacenterlight',
@@ -196,6 +196,7 @@ TEMPLATES = [
                  os.path.join(PROJECT_DIR, 'cms_templates/'),
                  os.path.join(PROJECT_DIR, 'cms_templates/djangocms_blog/'),
                  os.path.join(PROJECT_DIR, 'templates/gdpr'),
+                 os.path.join(PROJECT_DIR, 'templates'),
                  ],
         'APP_DIRS': True,
         'OPTIONS': {
diff --git a/hosting/models.py b/hosting/models.py
index b7175af5..16297ab8 100644
--- a/hosting/models.py
+++ b/hosting/models.py
@@ -209,9 +209,18 @@ class UserHostingKey(models.Model):
     name = models.CharField(max_length=100)
 
     def __str__(self):
-        display_str = '%s - %s - %s - %s - %s' % (
-            self.user.username,
-            self.user.email,
+        username = "None"
+        email = "None"
+        if self.user:
+            username = self.user.username
+            email = self.user.email
+        display_str = '''Username: %s,    
+Email: %s,
+Key name: %s,
+Created at: %s,
+Public Key: %s''' % (
+            username,
+            email,
             self.name,
             self.created_at,
             self.public_key
diff --git a/datacenterlight/templates/datacenterlight/admin/base_site.html b/templates/admin/base_site.html
similarity index 100%
rename from datacenterlight/templates/datacenterlight/admin/base_site.html
rename to templates/admin/base_site.html