diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index d52652e..6c8b0b1 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -150,6 +150,7 @@ class AccountController < ApplicationController
       session[:notice] = _("This environment doesn't allow password recovery.")
     end
     @change_password = ChangePassword.new(params[:change_password])
+    @change_password.environment_id = environment.id
 
     if request.post?
       begin
diff --git a/app/models/change_password.rb b/app/models/change_password.rb
index 741f8de..e17a722 100644
--- a/app/models/change_password.rb
+++ b/app/models/change_password.rb
@@ -3,6 +3,8 @@ class ChangePassword < Task
   settings_items :field, :value
   attr_accessor :password, :password_confirmation, :environment_id
 
+  include Noosfero::Plugin::HotSpot
+
   def self.human_attribute_name(attrib)
     case attrib.to_sym
     when :field
@@ -18,18 +20,36 @@ class ChangePassword < Task
     end
   end
 
-  def self.fields_choice
+  def plugins_fields
+    plugins.dispatch(:change_password_fields).inject({}) { |result, fields| result.merge!(fields)}
+  end
+
+  def environment
+    (requestor.environment if requestor) || Environment.find_by_id(environment_id)
+  end
+
+  def fields
+    %w[login email] + plugins_fields.map { |field, name| field.to_s }
+  end
+
+  def fields_choice
     [
       [_('Username'), 'login'],
       [_('Email'), 'email'],
-    ]
+    ] + plugins_fields.map { |field, name| [name, field] }
   end
 
   ###################################################
   # validations for creating a ChangePassword task 
   
   validates_presence_of :field, :value, :environment_id, :on => :create, :message => _('must be filled in')
-  validates_inclusion_of :field, :in => %w[login email]
+  # TODO Only on rails3
+  # validates_inclusion_of :field, :in => lambda { |data| data.fields }
+  validates_each :field do |data, attr, value|
+    unless data.fields.include?(value)
+      data.errors.add(attr, _('is not in the list of valid fields.'))
+    end
+  end
 
   validates_each :value, :on => :create do |data,attr,value|
     unless data.field.blank? || data.value.blank?
@@ -40,7 +60,7 @@ class ChangePassword < Task
     end
   end
 
-  before_validation_on_create do |change_password|
+  before_validation do |change_password|
     user = change_password.user_find
     change_password.requestor = user.person if user
   end
@@ -56,9 +76,10 @@ class ChangePassword < Task
   def user_find
     begin
       method = "find_by_#{field}_and_environment_id"
-      user = User.send(method, value, environment_id)
+      user = nil
+      user = User.send(method, value, environment_id) if User.respond_to?(method)
+      user = Person.send(method, value, environment_id).user if user.nil? && Person.respond_to?(method)
     rescue
-      nil
     end
     user
   end
@@ -105,8 +126,4 @@ class ChangePassword < Task
     end
   end
 
-  def environment
-    self.requestor.environment
-  end
-
 end
diff --git a/app/views/account/forgot_password.rhtml b/app/views/account/forgot_password.rhtml
index 0eb043a..32bf7eb 100644
--- a/app/views/account/forgot_password.rhtml
+++ b/app/views/account/forgot_password.rhtml
@@ -4,12 +4,9 @@
 
 <% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
 
-  <%= labelled_form_field(_('Field'), f.select(:field, ChangePassword.fields_choice)) %>
-
+  <%= labelled_form_field(_('Field'), f.select(:field, @change_password.fields_choice)) %>
   <%= f.text_field :value %>
 
-  <%= f.hidden_field :environment_id, :value => environment.id %>
-
 <div>
   <% button_bar do %>
     <%= submit_button('send', _('Send instructions')) %>
diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb
index 034f444..0070688 100644
--- a/lib/noosfero/plugin.rb
+++ b/lib/noosfero/plugin.rb
@@ -460,6 +460,12 @@ class Noosfero::Plugin
   def find_by_contents(asset, scope, query, paginate_options={}, options={})
   end
 
+  # -> Adds aditional fields for change_password
+  # returns = {:field1 => 'field1 name', :field2 => 'field2 name' ... }
+  def change_password_fields
+    nil
+  end
+
   # -> Adds additional blocks to profiles and environments.
   # Your plugin must implements a class method called 'extra_blocks'
   # that returns a hash with the following syntax.
diff --git a/plugins/stoa/lib/stoa_plugin.rb b/plugins/stoa/lib/stoa_plugin.rb
index 1b8f2cf..05e908d 100644
--- a/plugins/stoa/lib/stoa_plugin.rb
+++ b/plugins/stoa/lib/stoa_plugin.rb
@@ -120,4 +120,8 @@ class StoaPlugin < Noosfero::Plugin
     true
   end
 
+  def change_password_fields
+    {:usp_id => _('USP Number')}
+  end
+
 end
diff --git a/plugins/stoa/test/functional/account_controller_test.rb b/plugins/stoa/test/functional/account_controller_test.rb
index b448bdb..86af2c2 100644
--- a/plugins/stoa/test/functional/account_controller_test.rb
+++ b/plugins/stoa/test/functional/account_controller_test.rb
@@ -66,4 +66,8 @@ class AccountControllerTest < ActionController::TestCase
     assert_equal @user.login, assigns(:current_user).login
   end
 
+  should 'be able to recover password with usp_id' do
+    post :forgot_password, :change_password => { :field => 'usp_id', :value => '87654321' }
+    assert_template 'password_recovery_sent'
+  end
 end
diff --git a/test/unit/change_password_test.rb b/test/unit/change_password_test.rb
index 8c02e00..420be42 100644
--- a/test/unit/change_password_test.rb
+++ b/test/unit/change_password_test.rb
@@ -5,12 +5,12 @@ class ChangePasswordTest < ActiveSupport::TestCase
   fixtures :environments
 
   should 'validate' do
-    data = ChangePassword.new
+    data = ChangePassword.new(:environment_id => Environment.default)
     assert !data.valid?
   end
 
   should 'validate field is login or email' do
-    data = ChangePassword.new
+    data = ChangePassword.new(:environment_id => Environment.default)
     data.field = 'anything'
     data.valid?
     assert data.errors.invalid?(:field)
@@ -151,4 +151,28 @@ class ChangePasswordTest < ActiveSupport::TestCase
     assert_match(/#{task.requestor.name} wants to change its password/, email.subject)
   end
 
+  should 'allow extra fields provided by plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def change_password_fields
+        {:f1 => 'F1'}
+      end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def change_password_fields
+        {:f2 => 'F2', :f3 => 'F3'}
+      end
+    end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1)
+    environment.enable_plugin(Plugin2)
+    person = create_user('testuser').person
+
+    change_password = ChangePassword.new(:environment_id => environment.id)
+
+    assert_includes change_password.fields, 'f1'
+    assert_includes change_password.fields, 'f2'
+    assert_includes change_password.fields, 'f3'
+  end
+
 end
--
libgit2 0.21.2