diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index 5dd5c37..9691667 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -261,7 +261,11 @@ class AccountController < ApplicationController
   end
 
   def go_to_user_initial_page
-    redirect_back_or_default(:controller => "profile_editor", :profile => current_user.login, :action => 'index')
+    if environment == current_user.environment
+      redirect_back_or_default(user.admin_url)
+    else
+      redirect_back_or_default(:controller => 'home')
+    end
   end
 
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6cdebe2..2617ad9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -121,13 +121,22 @@ module ApplicationHelper
   end
 
   def link_to_homepage(text, profile = nil, options = {})
-    profile ||= current_user.login
-    link_to text, homepage_path(:profile => profile) , options
+    p = if profile
+          Profile[profile]
+        else
+          user
+        end
+
+    link_to text, p.url, options
   end
 
   def link_to_myprofile(text, url = {}, profile = nil, options = {})
-    profile ||= current_user.login
-    link_to text, { :profile => profile, :controller => 'profile_editor' }.merge(url), options
+    p = if profile
+          Profile[profile]
+        else
+          user
+        end
+    link_to text, p.admin_url.merge(url), options
   end
 
   def link_to_document(doc, text = nil)
diff --git a/app/models/person.rb b/app/models/person.rb
index e52bc76..7d21a82 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -154,8 +154,8 @@ class Person < Profile
     person.user.save!
   end
 
-  def is_admin?
-    role_assignments.map{|ra|ra.role.permissions}.any? do |ps|
+  def is_admin?(environment)
+    role_assignments.select { |ra| ra.resource == environment }.map{|ra|ra.role.permissions}.any? do |ps|
       ps.any? do |p|
         ActiveRecord::Base::PERMISSIONS['Environment'].keys.include?(p)
       end
diff --git a/app/views/blocks/profile_info_actions/person.rhtml b/app/views/blocks/profile_info_actions/person.rhtml
index 6f47392..054e2d2 100644
--- a/app/views/blocks/profile_info_actions/person.rhtml
+++ b/app/views/blocks/profile_info_actions/person.rhtml
@@ -2,7 +2,7 @@
   <%if logged_in? && (user != profile) %>
 
     <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
-      <li><%= link_to content_tag('span', __('Add friend')), { :profile => user.identifier, :controller => 'friends', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add' %></li>
+      <li><%= link_to content_tag('span', __('Add friend')), user.url.merge(:controller => 'friends', :action => 'add', :id => profile.id), :class => 'button with-text icon-add' %></li>
     <% end %>
 
     <% if user.is_a_friend?(profile) && profile.enable_contact? %>
diff --git a/app/views/home/index.rhtml b/app/views/home/index.rhtml
index 19c9388..c764d74 100644
--- a/app/views/home/index.rhtml
+++ b/app/views/home/index.rhtml
@@ -1,5 +1,3 @@
-<%= flash[:notice] %>
-
 <%= @environment.description %>
 
 <div id='home-search' style='text-align: center'>
diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml
index dd30ecc..c6259ba 100644
--- a/app/views/profile_editor/index.rhtml
+++ b/app/views/profile_editor/index.rhtml
@@ -21,7 +21,7 @@
 
   <%= file_manager_button(_('Edit Appearance'), 'icons-app/design-editor.png', :controller => 'themes', :action => 'index') %>
   
-  <%= file_manager_button(_('Edit Header and Footer'), 'icons-app/header-and-footer.png', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin? %>
+  <%= file_manager_button(_('Edit Header and Footer'), 'icons-app/header-and-footer.png', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
 
   <%= file_manager_button(_('Manage Content'), 'icons-app/cms.png', :controller => 'cms') unless environment.enabled?('disable_cms') || profile.community? %>
 
diff --git a/app/views/search/communities.rhtml b/app/views/search/communities.rhtml
index a178f9c..cd1eb52 100644
--- a/app/views/search/communities.rhtml
+++ b/app/views/search/communities.rhtml
@@ -14,7 +14,8 @@
 
 <% if logged_in? %>
   <% button_bar do %>
-    <%= button(:add, _('New community'), :controller => 'memberships', :action => 'new_community', :profile => current_user.person.identifier) %>
+    <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
+    <%= button(:add, _('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community')) %>
   <% end %>
 <% end %>
 
diff --git a/app/views/shared/user_menu.rhtml b/app/views/shared/user_menu.rhtml
index d90bf9b..f32f724 100644
--- a/app/views/shared/user_menu.rhtml
+++ b/app/views/shared/user_menu.rhtml
@@ -15,9 +15,9 @@
     <div id="user_menu_ul">
       <ul>
 
-        <li><a href="<%= homepage_path(:profile => current_user.login) %>"
-               help="<%= _('Go to your home page.') %>"
-               ><span class="icon-menu-home"></span><%= __('My Home Page') %></a></li>
+        <li>
+          <%= link_to( '<span class="icon-menu-home"></span>' + __('My Home Page'), user.url, :help => _('Go to your home page.'))%>
+        </li>
 
         <!-- li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li -->
 
@@ -32,16 +32,16 @@
                                      :help => _('Control panel: change your picture, edit your personal information, create content or change the way your home page looks.')
                                  ) %></li>
 
-        <%=
-          '<li>'+ link_to( '<span class="icon-menu-"></span>'+ _('Admin'),
-                           { :controller => 'admin_panel' }, :id => 'link_admin_panel',
-                           :help => _('Access the site administration panel.')
-                         ) +
-          '</li>' if user.is_admin?
-        %>
+        <% if user.is_admin?(environment) %>
+          <li><%= link_to( '<span class="icon-menu-"></span>'+ _('Admin'),
+                             {:controller => 'admin_panel' },
+                             :id => 'link_admin_panel',
+                             :help => _('Access the site administration panel.')
+                             )%></li>
+        <% end %>
 
         <li><%= link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'),
-                                  { :controller => 'account', :action => 'logout'},
+                                  {:controller => 'account', :action => 'logout'},
                                   :id => 'link_logout',
                                   :help => _('This link takes you out of the system. You should logout if other people are willing to use the same computer after you.')
                                 ) %></li>
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index b872721..9a54904 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -40,6 +40,16 @@ class AccountControllerTest < Test::Unit::TestCase
     assert_redirected_to :controller => 'profile_editor', :action => 'index', :profile => 'quire'
   end
 
+  should 'redirect to home when login on other environment' do
+    e = Environment.create!(:name => 'other_environment')
+    e.domains << Domain.new(:name => 'other.environment')
+    e.save!
+    u = create_user('test_user', :environment => e).person
+    post :login, :user => {:login => 'test_user', :password => 'test_user'}
+
+    assert_redirected_to :controller => 'home'
+  end
+
   def test_should_fail_login_and_not_redirect
     @request.env["HTTP_REFERER"] = 'bli'
     post :login, :user => {:login => 'johndoe', :password => 'bad password'}
@@ -275,7 +285,8 @@ class AccountControllerTest < Test::Unit::TestCase
   end
 
   should 'correct redirect after login' do
-    post :login, :user => {:login => 'johndoe', :password => 'test'}
+    user = create_user('correct_redirect').person
+    post :login, :user => {:login => 'correct_redirect', :password => 'correct_redirect'}
     assert_redirected_to :controller => 'profile_editor'
   end
 
diff --git a/test/functional/admin_panel_controller_test.rb b/test/functional/admin_panel_controller_test.rb
index 89439af..640443c 100644
--- a/test/functional/admin_panel_controller_test.rb
+++ b/test/functional/admin_panel_controller_test.rb
@@ -24,11 +24,6 @@ class AdminPanelControllerTest < Test::Unit::TestCase
   end
 
   should 'manage the correct environment' do
-    Environment.destroy_all
-
-    default = Environment.create!(:name => 'default env', :is_default => true)
-    Environment.stubs(:default).returns(default)
-
     current = Environment.create!(:name => 'test environment', :is_default => false)
     current.domains.create!(:name => 'example.com')
     
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index d16a099..4e30dbc 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -408,4 +408,20 @@ class ApplicationControllerTest < Test::Unit::TestCase
     get :index, :profile => p.identifier
     assert_tag 'title', :content => p.name + ' - ' + p.environment.name
   end
+
+  should 'display menu links for my environment when logged in other environment' do
+    e = Environment.create!(:name => 'other_environment')
+    e.domains << Domain.new(:name => 'other.environment')
+    e.save!
+
+    login_as(create_admin_user(e))
+    uses_host 'other.environment'
+    get :index
+    assert_tag :tag => 'div', :attributes => {:id => 'user_menu_ul'}
+    assert_tag :tag => 'div', :attributes => {:id => 'user_menu_ul'}, 
+                :descendant => {:tag => 'a', :attributes => { :href => 'http://other.environment/adminuser' }},
+                :descendant => {:tag => 'a', :attributes => { :href => 'http://other.environment/myprofile/adminuser' }},
+                :descendant => {:tag => 'a', :attributes => { :href => '/admin' }}
+  end
+
 end
diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb
index 667f113..1d8d94c 100644
--- a/test/functional/profile_controller_test.rb
+++ b/test/functional/profile_controller_test.rb
@@ -172,7 +172,7 @@ class ProfileControllerTest < Test::Unit::TestCase
     community = Community.create!(:name => 'my test community')
     community.add_admin(@profile)
     get :index, :profile => community.identifier
-    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}" }, :content => 'Control panel'
+    assert_tag :tag => 'a', :attributes => { :href => /\/myprofile\/#{@profile.identifier}/ }, :content => 'Control panel'
   end
 
   should 'show create community in own profile' do
diff --git a/test/integration/login_to_the_application_test.rb b/test/integration/login_to_the_application_test.rb
index e18be16..bca0a84 100644
--- a/test/integration/login_to_the_application_test.rb
+++ b/test/integration/login_to_the_application_test.rb
@@ -12,7 +12,8 @@ class LoginToTheApplicationTest < ActionController::IntegrationTest
     get '/account/login_popup'
     assert_response :success
 
-    login('ze', 'test')
+    create_user('test_user').person
+    login('test_user', 'test_user')
     assert_cannot_login
     assert_can_logout
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index c80d8d6..cb8d136 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -66,7 +66,7 @@ class Test::Unit::TestCase
   end
 
   def create_admin_user(env)
-    admin_user = User.find_by_login('adminuser') || create_user('adminuser', :email => 'adminuser@noosfero.org', :password => 'adminuser', :password_confirmation => 'adminuser')
+    admin_user = User.find_by_login('adminuser') || create_user('adminuser', :email => 'adminuser@noosfero.org', :password => 'adminuser', :password_confirmation => 'adminuser', :environment => env)
     admin_role = Role.find_by_name('admin_role') || Role.create!(:name => 'admin_role', :permissions => ['view_environment_admin_panel','edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_validators'])
     RoleAssignment.create!(:accessor => admin_user.person, :role => admin_role, :resource => env) unless admin_user.person.role_assignments.map{|ra|[ra.role, ra.accessor, ra.resource]}.include?([admin_role, admin_user, env])
     admin_user.login
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index 65aeb09..6210ed6 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -134,10 +134,27 @@ class PersonTest < Test::Unit::TestCase
     env = Environment.create!(:name => 'blah')
     person = create_user('just_another_person').person
     env.affiliate(person, role)
-    assert ! person.is_admin?
+    assert ! person.is_admin?(env)
     role.update_attributes(:permissions => ['view_environment_admin_panel'])
     person = Person.find(person.id)
-    assert person.is_admin?
+    assert person.is_admin?(env)
+  end
+
+  should 'separate admins of different environments' do
+    env1 = Environment.create!(:name => 'blah1')
+    env2 = Environment.create!(:name => 'blah2')
+
+    # role is an admin role
+    role = Role.create!(:name => 'just_another_admin_role')
+    role.update_attributes(:permissions => ['view_environment_admin_panel'])
+
+    # user is admin of env1, but not of env2
+    person = create_user('just_another_person').person
+    env1.affiliate(person, role)
+
+    person = Person.find(person.id)
+    assert person.is_admin?(env1)
+    assert !person.is_admin?(env2)
   end
 
   should 'get a default home page and a RSS feed' do
--
libgit2 0.21.2