diff --git a/library/Unl/View/Helper/WdnTemplate.php b/library/Unl/View/Helper/WdnTemplate.php
index d9a512f9350f027bc22e89147798ea08f329443a..e72ba0c6d0dfde5ee97c6a3ff776e7f098e0d908 100644
--- a/library/Unl/View/Helper/WdnTemplate.php
+++ b/library/Unl/View/Helper/WdnTemplate.php
@@ -50,17 +50,21 @@ class Unl_View_Helper_WdnTemplate extends Zend_View_Helper_Abstract
         $this->view->headLink(array('rel' => 'home',
                                     'href' => $staticBaseUrl,
                                     'title' => $layout->siteTitle));
-        
+
+        if (!is_array($layout->bodyClasses)) {
+            $layout->bodyClasses = array();
+        }
+
         require_once 'UNL/Templates.php';
         require_once 'UNL/Templates/CachingService/Null.php';
         UNL_Templates::setCachingService(new UNL_Templates_CachingService_Null());
         UNL_Templates::$options['version'] = UNL_Templates::VERSION3x1;
-        
-        $config = Unl_Application::getOptions();
-        if (isset($config['unl']['templates']['options']) && is_array($config['unl']['templates']['options'])) {
-            UNL_Templates::$options = array_merge(UNL_Templates::$options, $config['unl']['templates']['options']);
-        }
 
+        $config = Unl_Application::getOptions();
+        if (isset($config['unl']['templates']['options']) && is_array($config['unl']['templates']['options'])) {
+            UNL_Templates::$options = array_merge(UNL_Templates::$options, $config['unl']['templates']['options']);
+        }
+        
         if (!$layout->template) {
             if (UNL_Templates::$options['version'] == UNL_Templates::VERSION3x1) {
                 $layout->template = 'Local';
@@ -165,7 +169,11 @@ _gaq.push(['_trackPageview']);
 EOF;
         }
         $template->footercontent .= '</script>' . PHP_EOL;
-        
+
+        foreach ($layout->bodyClasses as $bodyClass) {
+            $template->__params['class']['value'] .= " $bodyClass";
+        }
+
         $html = $template->toHtml();
         return $html;
 	}