diff --git a/features/user_profile_edition.feature b/features/user_profile_edition.feature
new file mode 100644
index 0000000..59f923f
--- /dev/null
+++ b/features/user_profile_edition.feature
@@ -0,0 +1,47 @@
+Feature: Institution Field
+  As a user
+  I want to update my update my user data
+  So I can maintain my personal data updated
+
+  Background:
+    Given "MpogSoftwarePlugin" plugin is enabled
+    And I am logged in as admin
+    And I go to /admin/plugins
+    And I check "MpogSoftwarePlugin"
+    And I press "Save changes"
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I go to /account/logout
+    And Institutions has initial default values on database
+    And the following public institutions
+      | name                       | acronym | cnpj               | governmental_power | governmental_sphere |
+      | Ministerio das Cidades     | MC      | 58.745.189/0001-21 | Executivo          | Federal             |
+      | Governo do DF              | GDF     | 12.645.166/0001-44 | Legislativo        | Federal             |
+      | Ministerio do Planejamento | MP      | 41.769.591/0001-43 | Judiciario         | Federal             |
+    And I go to /account/signup
+    And Institutions has initial default values on database
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@nowitgo.com|
+      | Username              | josesilva              |
+      | Password              | secret                 |
+      | Password confirmation | secret                 |
+      | Full name             | José da Silva          |
+      | Secondary e-Mail      | josesilva@example.com  |
+    And wait for the captcha signup time
+    And I follow "Add new institution"
+    And I press "Create my account"
+    Then José da Silva's account is activated
+
+
+  @selenium-fixme
+  Scenario: Add more then one instituion on profile editor
+    Given I am on josesilva's control panel
+    And I follow "Edit Profile"
+    And I follow "Add new institution"
+    And I type in "Minis" into autocomplete list "input_institution" and I choose "Ministerio do Planejamento"
+    And I follow "Add new institution"
+    And I type in "Gover" into autocomplete list "input_institution" and I choose "Governo do DF"
+    And I follow "Add new institution"
+    And I press "Save"
+    And I follow "Edit Profile"
+    And I should see "Ministerio do Planejamento"
+    Then I should see "Governo do DF"
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index cd5b5d5..583069a 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -77,6 +77,18 @@ class AccountControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+
+  should "user can become a member of more than one institution" do
+    @user_info[:institution_ids] = [@institution_list.first.id, @institution_list.last.id]
+
+    post :signup, :user => @user_info, :profile_data => @profile_data_info
+
+    last_user = User.last
+
+    assert last_user.institutions.include?(@institution_list.first)
+    assert last_user.institutions.include?(@institution_list.last)
+  end
+
   private
 
   def create_institution name, acronym
--
libgit2 0.21.2