diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51b567693..f97e1db84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Upcoming Wekan release
+
+This release fixes the following bugs:
+
+* [Fix admin panel route for subfolder](https://github.com/wekan/wekan/pull/1084);
+
+Thanks to GitHub user nztqa for contributions.
+
 # v0.25 2017-06-24 Wekan release
 
 This release adds the following new features:
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index 51b0888bb..84ef5a096 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -18,7 +18,7 @@ template(name="memberMenuPopup")
       li: a.js-change-language {{_ 'changeLanguagePopup-title'}}
       li: a.js-edit-notification {{_ 'editNotificationPopup-title'}}
     if currentUser.isAdmin
-      li: a.js-go-setting(href='/setting') {{_ 'admin-panel'}}
+      li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}}
   hr
   ul.pop-over-list
     li: a.js-logout {{_ 'log-out'}}