diff --git a/library/Icinga/Application/Hook.php b/library/Icinga/Application/Hook.php
index 3a158a57c..99a350a23 100644
--- a/library/Icinga/Application/Hook.php
+++ b/library/Icinga/Application/Hook.php
@@ -263,7 +263,7 @@ class Hook
         }
 
         foreach (self::$hooks[$name] as $key => $hook) {
-            if (self::hasPermission($key)) {
+            if (self::hasPermission($hook)) {
                 if (self::createInstance($name, $key) === null) {
                     return array();
                 }
@@ -286,7 +286,7 @@ class Hook
 
         if (self::has($name)) {
             foreach (self::$hooks[$name] as $key => $hook) {
-                if (self::hasPermission($key)) {
+                if (self::hasPermission($hook)) {
                     return self::createInstance($name, $key);
                 }
             }
@@ -309,6 +309,8 @@ class Hook
             self::$hooks[$name] = array();
         }
 
+        $class = ltrim($class, ClassLoader::NAMESPACE_SEPARATOR);
+
         self::$hooks[$name][$key] = $class;
     }
 }