diff --git a/lib/mpog_software_plugin.rb b/lib/mpog_software_plugin.rb
index 78337c4..5b8c002 100644
--- a/lib/mpog_software_plugin.rb
+++ b/lib/mpog_software_plugin.rb
@@ -237,18 +237,11 @@ class MpogSoftwarePlugin < Noosfero::Plugin
   end
 
   def user_transaction
-    old_community = Institution.find(context.profile.user.institution_id).community
-    
+    user_editor_institution_actions
+
     User.transaction do
       context.profile.user.update_attributes!(context.params[:user])
     end
-    
-    new_community = Institution.find(context.params[:user][:institution_id]).community
-    if old_community != new_community
-      person = context.profile.user.person
-      old_community.remove_member(person)
-      new_community.add_member(person)
-    end
   end
 
   def institution_transaction
@@ -349,4 +342,38 @@ class MpogSoftwarePlugin < Noosfero::Plugin
       context.profile.software_info.controlled_vocabulary.update_attributes!(context.params[:controlled_vocabulary])
     end
   end
+
+  private
+
+  # Add and remove the user from it's institutions communities
+  def user_editor_institution_actions
+    user = context.profile.user
+
+    old_communities = []
+    context.profile.user.institutions.each do |institution|
+      old_communities << institution.community
+    end
+
+    new_communities = []
+    unless context.params[:user][:institution_ids].nil?
+      context.params[:user][:institution_ids].delete("")
+
+      context.params[:user][:institution_ids].each do |id|
+        new_communities << Institution.find(id).community
+      end
+    end
+
+    leave_communities = (old_communities - new_communities)
+    enter_communities = (new_communities - old_communities)
+
+    leave_communities.each do |community|
+      community.remove_member(user.person)
+      user.institutions.delete(community.institution)
+    end
+
+    enter_communities.each do |community|
+      community.add_member(user.person)
+      user.institutions << community.institution
+    end
+  end
 end
diff --git a/views/person_editor_extras.html.erb b/views/person_editor_extras.html.erb
index 0415f36..074c0bb 100644
--- a/views/person_editor_extras.html.erb
+++ b/views/person_editor_extras.html.erb
@@ -15,15 +15,28 @@
 </div>
 
 <div class="formfieldline" id="select_institution">
-  <%= label_tag "user[institution_id]", _('Institution'), :class=>"formlabel" %>
+  <%= label_tag "user[institution_ids]", _('Institutions'), :class=>"formlabel" %>
 
-  <div class="formfield type-text">
-    <%= select_tag "user[institution_id]", options_for_select(Institution.all.map {|i| [i.name, i.id]}, context.profile.institution_id) %>
+  <div class="institution_container">
+    <%= text_field_tag(:institution, "", :id=>"input_institution") %>
+
+    <% context.profile.user.institutions.each do |institution| %>
+      <%= hidden_field_tag("user[institution_ids][]", institution.id, :class => 'user_institutions') %>
+    <% end %>
   </div>
-<script type="text/javascript">
-jQuery(document).ready(function(){
-  var select = jQuery("#select_institution select");
-  select.append("<option value='-1'><%=_('Other')%></option>");
-});
-</script>
+
+  <%= content_tag(:div, _("The searched institution does not exist"), :id=>"institution_empty_ajax_message", :class=>"errorExplanation hide-field") %>
+  <%= link_to(_("Add new institution"), "#", :class=>'button with-text icon-add', :id => 'add_new_institution') %>
+
+  <%= hidden_field_tag("user[institution_ids][]", "", :class => 'user_institutions') %>
+  <%= hidden_field_tag("institution_selected", "") %>
+
+  <ul class="institutions_added">
+    <% context.profile.user.institutions.each do |institution| %>
+      <li data-institution="<%= institution.id %>">
+        <%= institution.name %>
+        <%= link_to("", "#", :class => "button without-text icon-remove remove-institution") %>
+      </li>
+    <% end %>
+  </ul>
 </div>
--
libgit2 0.21.2