diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 93c82b2..2b7fcd3 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -30,10 +30,14 @@ class ApplicationController < ActionController::Base
   before_filter :load_profile_from_params
   def load_profile_from_params
     if params[:profile]
-      @profile = Profile.find_by_identifier(params[:profile])
+      @profile ||= Profile.find_by_identifier(params[:profile])
     end
   end
 
+  def profile
+    @profile
+  end
+
   def self.acts_as_virtual_community_admin_controller
     before_filter :load_admin_controller
   end
diff --git a/app/controllers/profile_editor_controller.rb b/app/controllers/profile_editor_controller.rb
index 3c4bfce..729a312 100644
--- a/app/controllers/profile_editor_controller.rb
+++ b/app/controllers/profile_editor_controller.rb
@@ -4,8 +4,11 @@ class ProfileEditorController < ApplicationController
   # edits the profile info (posts back)
   def edit
     if request.post?
+      profile.info.update_attributes(params[:info])
+      redirect_to :action => 'index'
     else
-      render :action => profile.info.class.tableize
+      @info = profile.info
+      render :action => @info.class.name.underscore
     end
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6dd96c2..6c21404 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -158,4 +158,12 @@ module ApplicationHelper
     @profile || raise("There is no current profile")
   end
 
+  # displays an 
+  #
+  # Current implementation generates a <label> tag for +label+ and wrap the
+  # label and the control with a <div> tag with class 'formfield' 
+  def display_form_field(label, html_for_field)
+    content_tag('div', content_tag('div', content_tag('label', label)) + html_for_field, :class => 'formfield') 
+  end
+
 end
diff --git a/app/models/person.rb b/app/models/person.rb
index 99325ec..d3158fa 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -23,5 +23,6 @@ class Person < Profile
   def initialize(*args)
     super(*args)
     self.person_info ||= PersonInfo.new
+    self.person_info.person = self
   end
 end
diff --git a/app/models/person_info.rb b/app/models/person_info.rb
index 71702a1..fa3bcad 100644
--- a/app/models/person_info.rb
+++ b/app/models/person_info.rb
@@ -6,7 +6,7 @@ class PersonInfo < ActiveRecord::Base
 
   def summary
     [
-      [ _('Name'), self.person.name ],
+      [ _('Name'), self.name ],
       [ _('Address'), self.address ],
       [ _('Contact Information'), self.contact_information ],
     ]
diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml
new file mode 100644
index 0000000..bf5a772
--- /dev/null
+++ b/app/views/profile_editor/index.rhtml
@@ -0,0 +1,5 @@
+<h2><%= _('My profile') %></h2>
+
+<%= display_profile_info(profile) %>
+
+<%= link_to _('Edit'), :action => 'edit' %>
diff --git a/app/views/profile_editor/person_info.rhtml b/app/views/profile_editor/person_info.rhtml
new file mode 100644
index 0000000..982a7b4
--- /dev/null
+++ b/app/views/profile_editor/person_info.rhtml
@@ -0,0 +1,13 @@
+<h2><%= _('Edit person info') %></h2>
+
+<% form_for :info, @info do |f| %>
+
+  <%= display_form_field(_('Name'), f.text_field(:name)) %>
+
+  <%= display_form_field(_('Address'), f.text_area(:address, :rows => 5)) %>
+
+  <%= display_form_field(_('Contact Information'), f.text_area(:contact_information, :rows => 5)) %>
+
+  <%= submit_tag _('Save') %>
+
+<% end %>
diff --git a/db/migrate/013_create_person_infos.rb b/db/migrate/013_create_person_infos.rb
index 46fae21..79a56b2 100644
--- a/db/migrate/013_create_person_infos.rb
+++ b/db/migrate/013_create_person_infos.rb
@@ -1,6 +1,7 @@
 class CreatePersonInfos < ActiveRecord::Migration
   def self.up
     create_table :person_infos do |t|
+      t.column :name, :string
       t.column :photo, :text
       t.column :address, :text
       t.column :contact_information, :text
diff --git a/test/fixtures/person_infos.yml b/test/fixtures/person_infos.yml
new file mode 100644
index 0000000..b858b1e
--- /dev/null
+++ b/test/fixtures/person_infos.yml
@@ -0,0 +1,7 @@
+person_info_for_ze:
+  id: 1
+  person_id: 4
+  name: "Zé, José, Zezinho"
+  address: "house of the hat"
+  contact_information: "Pavilhão 9, Quadrante 13, Esquina com Avenida das Alamedas, 467, fundos, falar com Dona Ivete após as 16"
+
diff --git a/test/functional/profile_editor_controller_test.rb b/test/functional/profile_editor_controller_test.rb
index 10906ad..764f700 100644
--- a/test/functional/profile_editor_controller_test.rb
+++ b/test/functional/profile_editor_controller_test.rb
@@ -11,8 +11,46 @@ class ProfileEditorControllerTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
   end
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def test_index
+    profile = Person.new
+    profile.person_info.name = 'a test profile'
+    profile.person_info.address = 'my address'
+    profile.person_info.contact_information = 'my contact information'
+    @controller.instance_variable_set('@profile', profile)
+
+    get :index, :profile => 'test_profile'
+    assert_response :success
+    assert_not_nil assigns(:profile)
+
+    assert_tag :tag => 'td', :content => 'a test profile'
+    assert_tag :tag => 'td', :content => 'my address'
+    assert_tag :tag => 'td', :content => 'my contact information'
+  end
+
+  def test_edit_person_info
+    profile = Person.new
+    profile.name = 'a test profile'
+    profile.person_info.address = 'my address'
+    profile.person_info.contact_information = 'my contact information'
+    @controller.instance_variable_set('@profile', profile)
+
+    get :edit, :profile => 'test_profile'
+    assert_response :success
+    assert_template 'person_info'
+
   end
+
+  def test_saving_profile_info
+    profile = Person.new
+    profile.name = 'a test profile'
+    profile.person_info.address = 'my address'
+    profile.person_info.contact_information = 'my contact information'
+    @controller.instance_variable_set('@profile', profile)
+
+    profile.person_info.expects(:update_attributes).with({ 'contact_information' => 'new contact information', 'address' => 'new address' }).returns(true)
+    post :edit, :profile => 'test_profile', :info => { 'contact_information' => 'new contact information', 'address' => 'new address' }
+
+    assert_redirected_to :action => 'index'
+  end
+
 end
diff --git a/test/integration/edit_enterprise_test.rb b/test/integration/edit_enterprise_test.rb
index 7eb0929..9b91647 100644
--- a/test/integration/edit_enterprise_test.rb
+++ b/test/integration/edit_enterprise_test.rb
@@ -13,7 +13,7 @@ class EditEnterpriseTest < ActionController::IntegrationTest
 
     follow_redirect!
     assert_response :success
-    assert_tag :tag => 'a', :attributes => {:href => '/myprofile/ze/enterprise/edit/5'}
+    assert_tag :tag => 'a', :attributes => { :href => '/myprofile/ze/enterprise/edit/5'}
 
     get '/myprofile/ze/enterprise/edit/5'
     assert_response :success
diff --git a/test/integration/editing_person_info_test.rb b/test/integration/editing_person_info_test.rb
new file mode 100644
index 0000000..e09c28c
--- /dev/null
+++ b/test/integration/editing_person_info_test.rb
@@ -0,0 +1,27 @@
+require "#{File.dirname(__FILE__)}/../test_helper"
+
+class EditingPersonInfoTest < ActionController::IntegrationTest
+
+  fixtures :users, :profiles, :comatose_pages, :domains, :virtual_communities, :person_infos
+
+  should 'allow to edit person info' do
+
+    profile = Profile.find_by_identifier('ze')
+
+    login('ze', 'test')
+
+    get '/myprofile/ze'
+    assert_response :success
+
+    assert_tag :tag => 'td', :content => profile.person_info.name
+    assert_tag :tag => 'td', :content => profile.person_info.address
+    assert_tag :tag => 'td', :content => profile.person_info.contact_information
+
+    get '/myprofile/ze/profile_editor/edit'
+    assert_response :success
+
+    post '/myprofile/ze/profile_editor/edit', :info => { :address => 'a new address', :contact_information => 'a new contact information' }
+    assert_response :redirect
+
+  end
+end
diff --git a/test/unit/person_info_test.rb b/test/unit/person_info_test.rb
index 4d9b4cd..d62dfb3 100644
--- a/test/unit/person_info_test.rb
+++ b/test/unit/person_info_test.rb
@@ -12,9 +12,8 @@ class PersonInfoTest < Test::Unit::TestCase
 
   should 'provide needed information in summary' do
     person_info = PersonInfo.new
-    person_info.person = Person.new
-    person_info.person.name = 'person name'
 
+    person_info.name = 'person name'
     person_info.address = 'my address'
     person_info.contact_information = 'my contact information'
 
--
libgit2 0.21.2