diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3d4a9c6..7fa9664 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1121,7 +1121,7 @@ module ApplicationHelper
 
     (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
-    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :host => @environment.default_hostname, :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
+    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
     manage_enterprises.to_s +
     link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
     pending_tasks_count +
diff --git a/features/profile_domain.feature b/features/profile_domain.feature
index 3afbb08..57cce32 100644
--- a/features/profile_domain.feature
+++ b/features/profile_domain.feature
@@ -69,4 +69,4 @@ Feature: domain for profile
   Scenario: Compose link to administration with environment domain
     Given I am logged in as "joaosilva"
     When I visit "/" and wait
-    Then I should see "Administration" linking to "http://127.0.0.1:3001/admin"
+    Then I should see "Administration" linking to "http://127.0.0.1/admin"
--
libgit2 0.21.2