diff --git a/applications/welcome/models/db.py b/applications/welcome/models/db.py
index 761b41c9..5504a95e 100644
--- a/applications/welcome/models/db.py
+++ b/applications/welcome/models/db.py
@@ -118,6 +118,7 @@ response.meta.author = configuration.get('app.author')
 response.meta.description = configuration.get('app.description')
 response.meta.keywords = configuration.get('app.keywords')
 response.meta.generator = configuration.get('app.generator')
+response.show_toolbar = configuration.get('app.toolbar')
 
 # -------------------------------------------------------------------------
 # your http://google.com/analytics id                                      
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index c16bb0ea..a90c54df 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -94,7 +94,7 @@
         {{block center}}
         {{include}}
         {{end}}
-        {{=response.toolbar() if 'configuration' in globals() and configuration.get('app.toolbar') else ''}}
+        {{=response.toolbar() if response.show_toolbar else ''}}
       </div>
     </div>