diff --git a/service.py b/service.py
index b66b2e4..56b521d 100755
--- a/service.py
+++ b/service.py
@@ -4,6 +4,7 @@ import json
 import requests
 import tomlkit
 import urllib3
+import datetime
 urllib3.disable_warnings()
 
 class StatusPage:
@@ -16,7 +17,7 @@ class StatusPage:
         }
         requestbody = {
             "attrs": [ "name", "state", "last_check_result", "host_name", "display_name" ],
-            "joins": [ "host.name", "host.state", "host.last_check_result", "host.vars" ],
+            "joins": [ "host.name", "host.state", "host.last_check_result", "host.vars", "host.display_name" ],
             "filter": self.config['filters']['services'],
         }
         r = requests.get(request_url,
@@ -66,9 +67,9 @@ class StatusPage:
                     services_critical = services_critical + services_template.format(self.prettify(service['attrs']['display_name']), 'danger', 'CRITICAL')
 
                 if service['joins']['host']['state'] == 0:
-                    card_header = services_hostname_template.format(host, service['joins']['host']['vars']['pretty_name'], 'success', 'UP')
+                    card_header = services_hostname_template.format(host, service['joins']['host']['display_name'], 'success', 'UP')
                 else:
-                    card_header = services_hostname_template.format(host, service['joins']['host']['vars']['pretty_name'], 'danger', 'DOWN')
+                    card_header = services_hostname_template.format(host, service['joins']['host']['display_name'], 'danger', 'DOWN')
 
         with open("services_template.html", "r") as f:
             htmlTemplate = f.read()
@@ -99,7 +100,8 @@ class StatusPage:
             htmlTemplate = f.read()
 
         htmlOutput = htmlTemplate.format(
-            services = service_details
+            services = service_details,
+            date = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         )
 
         with open(self.config['output']['filename'], "w") as f:
diff --git a/template.html b/template.html
index ea70b7d..0d6f64f 100644
--- a/template.html
+++ b/template.html
@@ -17,6 +17,7 @@
             </div>
         </div>
         {services}
+        Generated: {date}
     </div>
 </body>
 </html>