diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index 9c2d585182e138187538f42516b1efff946f83ae..4727f62bba8f58a8a108a6052c3270a63de096f9 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -142,7 +142,7 @@ class baseSelector {
   {
     global $config;
 
-    if (!isset($this->base) || ($this->base == "")) {
+    if (!isset($this->base) || ($this->base == '')) {
       $this->lastState = FALSE;
       return FALSE;
     }
@@ -179,7 +179,6 @@ class baseSelector {
           }
         }
       }
-
     }
 
     /* Skip if there's no change */
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 408497a3fcf80de945eeffbb17cb6a4a6e481460..c73d9cc0baa5d2046a042d30fdadd4a6b0cb4471 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -459,7 +459,7 @@ class plugin
     $is_new = empty($oc);
 
     /* Load (minimum) attributes, add missing ones */
-    $this->attrs['objectClass'] = array_merge_unique($oc, $this->objectclasses);
+    $this->attrs['objectClass'] = $this->mergeObjectClasses($oc);
 
     /* Copy standard attributes */
     foreach ($this->attributes as $val) {
diff --git a/include/class_template.inc b/include/class_template.inc
index ebb73833d03b8dc032bc970490d862a4952e2a20..08c5496c44f5f24450b77934898adcddbb60e414 100644
--- a/include/class_template.inc
+++ b/include/class_template.inc
@@ -191,6 +191,11 @@ class template
   {
     if ($targetdn !== NULL) {
       $this->tabObject = objects::open($targetdn, $this->type);
+      foreach ($this->tabObject->by_object as $class => &$plugin) {
+        if ($plugin->is_account || $plugin->ignore_account) {
+          $this->attrs['objectClass'] = $plugin->mergeObjectClasses($this->attrs['objectClass']);
+        }
+      }
     } elseif ($this->applied) {
       trigger_error('Templates can’t be applied twice without calling reset before');
       return;
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index 34a2a0511de7fb1261204422e47c42d980555378..c4e88e2e05c85515ac1f8d3229d7bad340f3999f 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -657,6 +657,12 @@ class simplePlugin extends plugin
     $this->post_save();
   }
 
+  /* Used by prepare_save and template::apply */
+  public function mergeObjectClasses(array $oc)
+  {
+    return array_merge_unique($oc, $this->objectclasses);
+  }
+
   protected function prepare_save ()
   {
     /* Call parents save to prepare $this->attrs */