diff --git a/app/views/profile_editor/_organization.rhtml b/app/views/profile_editor/_organization.rhtml
index 395a311..24d405e 100644
--- a/app/views/profile_editor/_organization.rhtml
+++ b/app/views/profile_editor/_organization.rhtml
@@ -2,6 +2,8 @@
 
   <%= required_fields_message if @profile.required_fields.any? %>
 
+  <%= required f.text_field(:name) %>
+
 <% if @environment.enabled?('enable_organization_url_change') %>
   <script type="text/javascript">
     function updateUrlField(name_field, id) {
diff --git a/features/change_organization_name.feature b/features/change_organization_name.feature
new file mode 100644
index 0000000..34f149c
--- /dev/null
+++ b/features/change_organization_name.feature
@@ -0,0 +1,35 @@
+Feature: change organization name
+  As an organization's admin
+  I want to change it's name
+  In order to keep it's name consistent
+
+  Scenario: changing community's name
+    Given the following communities
+      | identifier | name |
+      | sample-community | Sample Community |
+    And the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+    And "Joao Silva" is admin of "Sample Community"
+    And I am logged in as "joaosilva"
+    And I am on Sample Community's control panel
+    And I follow "Community Info and settings"
+    And I fill in "Name" with "New Sample Community"
+    When I press "Save"
+    Then I should be on New Sample Community's control panel
+
+
+  Scenario: changing enterprise's name
+    Given the following enterprises
+      | identifier | name |
+      | sample-enterprise | Sample Enterprise |
+    And the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+    And "Joao Silva" is admin of "Sample Enterprise"
+    And I am logged in as "joaosilva"
+    And I am on Sample Enterprise's control panel
+    And I follow "Enterprise Info and settings"
+    And I fill in "Name" with "New Sample Enterprise"
+    When I press "Save"
+    Then I should be on New Sample Enterprise's control panel
diff --git a/features/step_definitions/noosfero_steps.rb b/features/step_definitions/noosfero_steps.rb
index 61d1387..f28245f 100644
--- a/features/step_definitions/noosfero_steps.rb
+++ b/features/step_definitions/noosfero_steps.rb
@@ -97,3 +97,9 @@ end
 Given /^"(.+)" should be a member of "(.+)"$/ do |person,profile|
   Profile.find_by_name(profile).members.should include(Person.find_by_name(person))
 end
+
+Given /^"(.+)" is admin of "(.+)"$/ do |person, organization|
+  org = Profile.find_by_name(organization)
+  user = Profile.find_by_name(person)
+  org.add_admin(user)
+end
--
libgit2 0.21.2