diff --git a/app/views/account/_signup_form.rhtml b/app/views/account/_signup_form.rhtml
index 41dee50..d5b3118 100644
--- a/app/views/account/_signup_form.rhtml
+++ b/app/views/account/_signup_form.rhtml
@@ -73,8 +73,6 @@
     <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
   <% end %>
 
-
-
   <%= @plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
 
   <% unless @terms_of_use.blank? %>
diff --git a/app/views/friends/index.rhtml b/app/views/friends/index.rhtml
index 6096595..d2a1907 100644
--- a/app/views/friends/index.rhtml
+++ b/app/views/friends/index.rhtml
@@ -4,17 +4,17 @@
 
 <% cache_timeout(profile.manage_friends_cache_key(params), 4.hours) do %>
   <% if @friends.empty? %>
-  <p>
-  <em>
-    <%= __('You have no friends yet.') %>
-    <%= link_to _('Do you want to see other people in this environment?'), :controller => 'search', :action => 'assets', :asset => 'people' %>
-  </em>
-  </p>
+    <p>
+      <em>
+        <%= __('You have no friends yet.') %>
+        <%= link_to _('Do you want to see other people in this environment?'), :controller => 'search', :action => 'assets', :asset => 'people' %>
+      </em>
+    </p>
   <% else %>
     <% button_bar do %>
       <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
       <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
-      <% if !@plugins.dispatch(:remove_invite_friends_button).include?(true) %>
+      <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
         <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
       <% end %>
     <% end %>
@@ -45,7 +45,7 @@
   <% button_bar do %>
     <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
     <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
-    <% if !@plugins.dispatch(:remove_invite_friends_button).include?(true) %>
+    <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
       <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
     <% end %>
   <% end %>
diff --git a/app/views/invite/select_friends.rhtml b/app/views/invite/select_friends.rhtml
index 395c73f..721a377 100644
--- a/app/views/invite/select_friends.rhtml
+++ b/app/views/invite/select_friends.rhtml
@@ -20,7 +20,7 @@
   <%= hidden_field_tag(:contact_list, @contact_list.id) %>
 
   <div>
-  <%= labelled_form_field(_('Enter one e-mail address per line:'), text_area_tag(:manual_import_addresses, (@manual_import_addresses || ''), :cols => 72, :rows => 5)) %>
+  <%= labelled_form_field(_('Enter one e-mail address per line:'), text_area_tag(:manual_import_addresses, (@manual_import_addresses || ''), :rows => 5, :style => 'width: 98%;')) %>
   </div>
   <% if @import_from != 'manual' %>
     <div>
diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb
index 2d88df4..81e07dc 100644
--- a/lib/noosfero/plugin.rb
+++ b/lib/noosfero/plugin.rb
@@ -99,7 +99,7 @@ class Noosfero::Plugin
   # returns   = { :title => title, :id => id, :content => content, :start => start }
   #   title   = name that will be displayed.
   #   id      = div id.
-  #   content = lambda block that creates a html code.
+  #   content = lambda block that creates html code.
   #   start   = boolean that specifies if the tab must come before noosfero tabs (optional).
   def profile_tabs
     nil
@@ -112,7 +112,7 @@ class Noosfero::Plugin
   end
 
   # -> Adds content to calalog item
-  # returns = lambda block that creates a html code
+  # returns = lambda block that creates html code
   def catalog_item_extras(item)
     nil
   end
@@ -124,19 +124,19 @@ class Noosfero::Plugin
   end
 
   # -> Adds content to calalog list item
-  # returns = lambda block that creates a html code
+  # returns = lambda block that creates html code
   def catalog_list_item_extras(item)
     nil
   end
 
   # -> Adds content to products info
-  # returns = lambda block that creates a html code
+  # returns = lambda block that creates html code
   def product_info_extras(product)
     nil
   end
 
   # -> Adds content to products on asset list
-  # returns = lambda block that creates a html code
+  # returns = lambda block that creates html code
   def asset_product_extras(product, enterprise)
     nil
   end
@@ -239,13 +239,13 @@ class Noosfero::Plugin
   end
 
   # -> Adds fields to the signup form
-  # returns = lambda block that creates a html code
+  # returns = lambda block that creates html code
   def signup_extra_contents
     nil
   end
 
   # -> Adds adicional content to profile info
-  # returns = lambda block that creates a html code
+  # returns = lambda block that creates html code
   def profile_info_extra_contents
     nil
   end
diff --git a/plugins/stoa/README b/plugins/stoa/README
index a3485e4..daa27df 100644
--- a/plugins/stoa/README
+++ b/plugins/stoa/README
@@ -1,12 +1,28 @@
-Banco de Dados
-==============
+README - Stoa (Stoa Plugin)
+================================
+
+Plugin that includes features to Stoa, USP's social network
+
+More informartion about Stoa: http://wiki.stoa.usp.br/Stoa:Sobre
+
+DATABASE
+========
+
+First you need to configure Noosfero to connect with the database users from USP.
+For that, add a section setting the connection on file config/database.yml with the the identifier "stoa".
+
+Example:
+--------
 
-É preciso adicionar uma seção definindo a conexão com o banco de usuários da USP, no arquivo config/database.yml com identificador stoa.
-``
 stoa:
   adapter: mysql
   host: db2.stoa.usp.br
   database: usp
   username: <usuario>
   password: <senha>
-``
+
+CONFIGURATION
+=============
+
+Copy config.yml.dist to config.yml on Stoa plugin's folder.
+You need to customize this configuration, adding a Salt ( http://en.wikipedia.org/wiki/Salt_(cryptography) ).
diff --git a/plugins/stoa/config.yml.dist b/plugins/stoa/config.yml.dist
new file mode 100644
index 0000000..8335f30
--- /dev/null
+++ b/plugins/stoa/config.yml.dist
@@ -0,0 +1 @@
+salt: '123456789'
diff --git a/plugins/stoa/lib/ext/person.rb b/plugins/stoa/lib/ext/person.rb
index 433dccd..ef8f2f7 100644
--- a/plugins/stoa/lib/ext/person.rb
+++ b/plugins/stoa/lib/ext/person.rb
@@ -7,7 +7,7 @@ class Person
 
   def usp_id_or_invitation
     if usp_id.blank? && (invitation_code.blank? || !invitation_task)
-      errors.add(:usp_id, "can't register without usp_id or invitation")
+      errors.add(:usp_id, "can't register without usp_id or a valid invitation code")
     end
   end
 
diff --git a/plugins/stoa/lib/stoa_plugin/usp_user.rb b/plugins/stoa/lib/stoa_plugin/usp_user.rb
index 178c422..0fc9087 100644
--- a/plugins/stoa/lib/stoa_plugin/usp_user.rb
+++ b/plugins/stoa/lib/stoa_plugin/usp_user.rb
@@ -9,11 +9,11 @@ class StoaPlugin::UspUser < ActiveRecord::Base
   alias_attribute :birth_date, :dtanas
 
   def self.exists?(usp_id)
-    !StoaPlugin::UspUser.find(:first, :conditions => {:codpes => usp_id.to_i}).nil?
+    StoaPlugin::UspUser.find_by_codpes(usp_id.to_i)
   end
 
   def self.matches?(usp_id, field, value)
-    user = StoaPlugin::UspUser.find(:first, :conditions => {:codpes => usp_id.to_i})
+    user = StoaPlugin::UspUser.find_by_codpes(usp_id.to_i)
     return false if user.nil? || !user.respond_to?(field) || value.blank?
     case field.to_sym
     when :cpf
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 12f8244..dcf18d5 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -6548,7 +6548,6 @@ h1#agenda-title {
 #signup-form #user_password,
 #signup-form #user_password_confirmation,
 #signup-form .filled-in,
-#signup-form .passwords_match,
 #signup-form .invalid,
 #signup-form .checking {
   border-width: 2px;
--
libgit2 0.21.2