diff --git a/extension.json b/extension.json
index 4903be2..050f55d 100644
--- a/extension.json
+++ b/extension.json
@@ -13,9 +13,9 @@
     }
   },
   "Hooks": {
-    "SkinBuildSidebar": "HideSidebarHooks::efHideSidebar"
+    "SidebarBeforeOutput": "HideSidebarHooks::efHideSidebar"
   },
   "AutoloadClasses": {
-    "HideSidebarHooks": "HideSidebar.hooks.php"
+    "HideSidebarHooks": "includes/HideSidebar.hooks.php"
   }
 }
diff --git a/HideSidebar.hooks.php b/includes/HideSidebar.hooks.php
similarity index 84%
rename from HideSidebar.hooks.php
rename to includes/HideSidebar.hooks.php
index 5a993f7..b977c15 100644
--- a/HideSidebar.hooks.php
+++ b/includes/HideSidebar.hooks.php
@@ -3,7 +3,7 @@ class HideSidebarHooks {
     public static function efHideSidebar( $skin, &$bar ) {
         // Hide sidebar for anonymous users
         if ( $skin->getUser()->isAnon() ) {
-            $url = Title::makeTitle( NS_SPECIAL, 'UserLogin' )->getLocalUrl();
+            $url = SpecialPage::getTitleFor( 'UserLogin' )->getLocalUrl();
             $bar = [];
             $bar['navigation'][] = [
                 'text'   => 'Login',