diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c622771..e86ecfb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -11,7 +11,7 @@ module ApplicationHelper
   include BoxesHelper
 
   include FormsHelper
-  
+
   include AssetsHelper
 
   include BlockHelper
@@ -94,7 +94,7 @@ module ApplicationHelper
     if options[:type] == :textile
       content = RedCloth.new(content).to_html
     end
-    
+
     options[:class] = '' if ! options[:class]
     options[:class] += ' button icon-help' # with-text
 
@@ -269,7 +269,7 @@ module ApplicationHelper
     if klass.nil?
       raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
     end
-    
+
     name = klass.name.underscore
     if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], "_#{name}.rhtml"))
       name
@@ -285,7 +285,7 @@ module ApplicationHelper
   # DEPRECATED. Do not use this.
   def stylesheet_import(*sources)
     options = sources.last.is_a?(Hash) ? sources.pop : { }
-    themed_source = options.delete(:themed_source) 
+    themed_source = options.delete(:themed_source)
     content_tag(
       'style',
       "\n" +
@@ -299,7 +299,7 @@ module ApplicationHelper
       end.join(),
       { "type" => "text/css" }.merge(options)
     )
-  end 
+  end
 
   # DEPRECATED. Do not use this.
   def filename_for_stylesheet(name, in_theme)
@@ -391,7 +391,7 @@ module ApplicationHelper
     Theme.find(current_theme).owner.identifier
   end
 
-  # generates a image tag for the profile. 
+  # generates a image tag for the profile.
   #
   # If the profile has no image set yet, then a default image is used.
   def profile_image(profile, size=:portrait, opt={})
@@ -787,8 +787,9 @@ module ApplicationHelper
       field_html ||= ''
       field_html += capture(&block)
     end
-    if (controller.action_name == 'signup')
-      if profile.signup_fields.include?(name) || profile.required_fields.include?(name)
+
+    if controller.action_name == 'signup' || controller.action_name == 'new_community' || (controller.controller_name == "enterprise_registration" && controller.action_name == 'index')
+      if profile.signup_fields.include?(name)
         result = field_html
       end
     else
@@ -796,6 +797,7 @@ module ApplicationHelper
         result = field_html
       end
     end
+
     if is_required
       result = required(result)
     end
diff --git a/app/models/community.rb b/app/models/community.rb
index 9a1e98b..4285efb 100644
--- a/app/models/community.rb
+++ b/app/models/community.rb
@@ -23,10 +23,6 @@ class Community < Organization
   xss_terminate :only => [ :name, :address, :contact_phone, :description ], :on => 'validation'
 
   FIELDS = %w[
-    city
-    state
-    country
-    zip_code
     language
   ]
 
@@ -38,7 +34,7 @@ class Community < Organization
     super
     self.required_fields.each do |field|
       if self.send(field).blank?
-        self.errors.add(field, _('%{fn} is mandatory'))
+        self.errors.add(field, _('%{fn} can\'t be blank'))
       end
     end
   end
@@ -51,6 +47,10 @@ class Community < Organization
     environment ? environment.required_community_fields : []
   end
 
+  def signup_fields
+    environment ? environment.signup_community_fields : []
+  end
+
   def name=(value)
     super(value)
     self.identifier = value.to_slug
diff --git a/app/models/create_community.rb b/app/models/create_community.rb
index b4157df..69eee37 100644
--- a/app/models/create_community.rb
+++ b/app/models/create_community.rb
@@ -14,7 +14,7 @@ class CreateCommunity < Task
 
   acts_as_having_image
 
-  DATA_FIELDS = Community.fields + ['name', 'closed', 'tag_list']
+  DATA_FIELDS = Community.fields + ['name', 'closed']
 
   DATA_FIELDS.each do |field|
     # getter
@@ -30,7 +30,7 @@ class CreateCommunity < Task
   def validate
     self.environment.required_community_fields.each do |field|
       if self.send(field).blank?
-        self.errors.add(field, _('%{fn} is mandatory'))
+        self.errors.add(field, _('%{fn} can\'t be blank'))
       end
     end
   end
diff --git a/app/models/create_enterprise.rb b/app/models/create_enterprise.rb
index e5adca8..36d7c86 100644
--- a/app/models/create_enterprise.rb
+++ b/app/models/create_enterprise.rb
@@ -106,6 +106,10 @@ class CreateEnterprise < Task
     environment ? environment.required_enterprise_fields : []
   end
 
+  def signup_fields
+    environment ? environment.signup_enterprise_fields : []
+  end
+
   def community?
     false
   end
diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index 6e20217..2383e61 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -27,10 +27,6 @@ class Enterprise < Organization
 
   FIELDS = %w[
     business_name
-    zip_code
-    city
-    state
-    country
     organization_website
     historic_and_current_context
     activities_short_description
@@ -59,6 +55,10 @@ class Enterprise < Organization
     environment ? environment.required_enterprise_fields : []
   end
 
+  def signup_fields
+    environment ? environment.signup_enterprise_fields : []
+  end
+
   def product_categories
     products.map{|p| p.category_full_name}.compact
   end
diff --git a/app/models/environment.rb b/app/models/environment.rb
index af3280b..9de3ddb 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -238,7 +238,7 @@ class Environment < ActiveRecord::Base
   def activation_blocked_text
     self.settings['activation_blocked_text']
   end
-  
+
   def activation_blocked_text= value
     self.settings['activation_blocked_text'] = value
   end
@@ -327,14 +327,25 @@ class Environment < ActiveRecord::Base
     if values['schooling'] && values['schooling']['active'] == 'true'
       schooling_status = values['schooling']
     end
+
     self.settings[:custom_person_fields] = values.delete_if { |key, value| ! Person.fields.include?(key)}
+    self.settings[:custom_person_fields].each_pair do |key, value|
+      if value['required'] == 'true'
+        self.settings[:custom_person_fields][key]['active'] = 'true'
+        self.settings[:custom_person_fields][key]['signup'] = 'true'
+      end
+      if value['signup'] == 'true'
+        self.settings[:custom_person_fields][key]['active'] = 'true'
+      end
+    end
+
     if schooling_status
       self.settings[:custom_person_fields]['schooling_status'] = schooling_status
     end
   end
 
   def custom_person_field(field, status)
-    if (custom_person_fields[field] && custom_person_fields[field][status] == 'true') 
+    if (custom_person_fields[field] && custom_person_fields[field][status] == 'true')
       return true
     end
     false
@@ -390,10 +401,19 @@ class Environment < ActiveRecord::Base
 
   def custom_enterprise_fields=(values)
     self.settings[:custom_enterprise_fields] = values.delete_if { |key, value| ! Enterprise.fields.include?(key)}
+    self.settings[:custom_enterprise_fields].each_pair do |key, value|
+      if value['required'] == 'true'
+        self.settings[:custom_enterprise_fields][key]['active'] = 'true'
+        self.settings[:custom_enterprise_fields][key]['signup'] = 'true'
+      end
+      if value['signup'] == 'true'
+        self.settings[:custom_enterprise_fields][key]['active'] = 'true'
+      end
+    end
   end
 
   def custom_enterprise_field(field, status)
-    if (custom_enterprise_fields[field] && custom_enterprise_fields[field][status] == 'true') 
+    if (custom_enterprise_fields[field] && custom_enterprise_fields[field][status] == 'true')
       return true
     end
     false
@@ -411,16 +431,32 @@ class Environment < ActiveRecord::Base
     required_fields
   end
 
+  def signup_enterprise_fields
+    signup_fields = []
+    active_enterprise_fields.each do |field|
+      signup_fields << field if custom_enterprise_fields[field]['signup'] == 'true'
+    end
+    signup_fields
+  end
+
   def custom_community_fields
     self.settings[:custom_community_fields].nil? ? {} : self.settings[:custom_community_fields]
   end
-
   def custom_community_fields=(values)
     self.settings[:custom_community_fields] = values.delete_if { |key, value| ! Community.fields.include?(key) }
+    self.settings[:custom_community_fields].each_pair do |key, value|
+      if value['required'] == 'true'
+        self.settings[:custom_community_fields][key]['active'] = 'true'
+        self.settings[:custom_community_fields][key]['signup'] = 'true'
+      end
+      if value['signup'] == 'true'
+        self.settings[:custom_community_fields][key]['active'] = 'true'
+      end
+    end
   end
 
   def custom_community_field(field, status)
-    if (custom_community_fields[field] && custom_community_fields[field][status] == 'true') 
+    if (custom_community_fields[field] && custom_community_fields[field][status] == 'true')
       return true
     end
     false
@@ -438,6 +474,14 @@ class Environment < ActiveRecord::Base
     required_fields
   end
 
+  def signup_community_fields
+    signup_fields = []
+    active_community_fields.each do |field|
+      signup_fields << field if custom_community_fields[field]['signup'] == 'true'
+    end
+    signup_fields
+  end
+
   def category_types
     self.settings[:category_types].nil? ? ['Category'] : self.settings[:category_types]
   end
@@ -483,7 +527,7 @@ class Environment < ActiveRecord::Base
     self.find(:first, :conditions => [ 'is_default = ?', true ] )
   end
 
-  # returns an array with the top level categories for this environment. 
+  # returns an array with the top level categories for this environment.
   def top_level_categories
     Category.top_level_for(self)
   end
@@ -527,7 +571,7 @@ class Environment < ActiveRecord::Base
     self.articles.recent(limit)
   end
 
-  has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event' 
+  has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event'
 
   has_many :tags, :through => :articles
 
@@ -578,7 +622,7 @@ class Environment < ActiveRecord::Base
   def community_template=(value)
     settings[:community_template_id] = value.id
   end
- 
+
   def person_template
     Person.find_by_id settings[:person_template_id]
   end
diff --git a/app/models/organization.rb b/app/models/organization.rb
index b3ab0cb..57d49b8 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -48,14 +48,20 @@ class Organization < Profile
   end
 
   FIELDS = %w[
+    display_name
+    description
     contact_person
-    contact_phone
     contact_email
-    description
+    contact_phone
     legal_form
     economic_activity
     management_information
     address
+    zip_code
+    city
+    state
+    country
+    tag_list
   ]
 
   def self.fields
@@ -70,8 +76,12 @@ class Organization < Profile
     []
   end
 
-  N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Validated')
-  settings_items :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :validated, :cnpj
+  def signup_fields
+    []
+  end
+
+  N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Validated'); N_('Tag list')
+  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :validated, :cnpj
 
   validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT
 
diff --git a/app/views/cms/edit.rhtml b/app/views/cms/edit.rhtml
index aee8956..4fbceae 100644
--- a/app/views/cms/edit.rhtml
+++ b/app/views/cms/edit.rhtml
@@ -28,9 +28,6 @@
 
   <%= select_categories(:article, _('Categorize your article')) %>
 
-  <%= f.text_field('tag_list', :size => 64) %>
-  <%= content_tag( 'small', _('Separate tags with commas') ) %>
-
   <div id='edit-article-options'>
     <%= options_for_article(@article) %>
   </div>
diff --git a/app/views/enterprise_registration/basic_information.rhtml b/app/views/enterprise_registration/basic_information.rhtml
index c56d28f..838a3cc 100644
--- a/app/views/enterprise_registration/basic_information.rhtml
+++ b/app/views/enterprise_registration/basic_information.rhtml
@@ -20,8 +20,8 @@
 
   <% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
     <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
-    <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 25))) %>
-    <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise, :only_required => false } %>
+    <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
+    <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
     <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %>
 
     <% if @validation == :admin %>
diff --git a/app/views/features/_manage_community_fields.rhtml b/app/views/features/_manage_community_fields.rhtml
index 6eac4d7..f15dc53 100644
--- a/app/views/features/_manage_community_fields.rhtml
+++ b/app/views/features/_manage_community_fields.rhtml
@@ -7,18 +7,25 @@
     <th><%= _('Field') %></th>
     <th><%= _('Active') %></th>
     <th><%= _('Required') %></th>
+    <th><%= _('Display on creation?') %></th>
   </tr>
   <% @community_fields.each do |field| %>
   <tr>
     <td><label for="community_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
+
     <td>
-      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=!this.checked" %>
+      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=$('community_fields[#{field}][signup]').disabled=!this.checked;" %>
       <%= hidden_field_tag  "community_fields[#{field}][active]", false %>
     </td>
     <td>
-      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required') %>
+      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "if(this.checked) $('community_fields[#{field}][signup]').checked = true;" %>
       <%= hidden_field_tag  "community_fields[#{field}][required]", false %>
     </td>
+    <td>
+      <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "if(!this.checked) $('community_fields[#{field}][required]').checked = false;" %>
+      <%= hidden_field_tag  "community_fields[#{field}][signup]", false %>
+    </td>
+
   </tr>
   <% end %>
 </table>
diff --git a/app/views/features/_manage_enterprise_fields.rhtml b/app/views/features/_manage_enterprise_fields.rhtml
index ea4435a..4e374b0 100644
--- a/app/views/features/_manage_enterprise_fields.rhtml
+++ b/app/views/features/_manage_enterprise_fields.rhtml
@@ -7,18 +7,25 @@
     <th><%= _('Field') %></th>
     <th><%= _('Active') %></th>
     <th><%= _('Required') %></th>
+    <th><%= _('Display on registration?') %></th>
   </tr>
   <% @enterprise_fields.each do |field| %>
   <tr>
+
     <td><label for="enterprise_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
-      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=!this.checked" %>
+      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=$('enterprise_fields[#{field}][signup]').disabled=!this.checked;" %>
       <%= hidden_field_tag  "enterprise_fields[#{field}][active]", false %>
     </td>
     <td>
-      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required') %>
+      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "if(this.checked) $('enterprise_fields[#{field}][signup]').checked = true;" %>
       <%= hidden_field_tag  "enterprise_fields[#{field}][required]", false %>
     </td>
+    <td>
+      <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "if(!this.checked) $('enterprise_fields[#{field}][required]').checked = false;" %>
+      <%= hidden_field_tag  "enterprise_fields[#{field}][signup]", false %>
+    </td>
+
   </tr>
   <% end %>
 </table>
diff --git a/app/views/features/_manage_person_fields.rhtml b/app/views/features/_manage_person_fields.rhtml
index 272670d..06b9531 100644
--- a/app/views/features/_manage_person_fields.rhtml
+++ b/app/views/features/_manage_person_fields.rhtml
@@ -13,15 +13,15 @@
   <tr>
     <td><label for="person_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
-      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked" %>
+      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked;" %>
       <%= hidden_field_tag  "person_fields[#{field}][active]", false %>
     </td>
     <td>
-      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required') %>
+      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "if(this.checked) $('person_fields[#{field}][signup]').checked = true;" %>
       <%= hidden_field_tag  "person_fields[#{field}][required]", false %>
     </td>
     <td>
-      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup') %>
+      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "if(!this.checked) $('person_fields[#{field}][required]').checked = false;" %>
       <%= hidden_field_tag  "person_fields[#{field}][signup]", false %>
     </td>
   </tr>
diff --git a/app/views/memberships/new_community.rhtml b/app/views/memberships/new_community.rhtml
index 6aed0da..3492b79 100644
--- a/app/views/memberships/new_community.rhtml
+++ b/app/views/memberships/new_community.rhtml
@@ -22,10 +22,7 @@
 
   <%= hidden_field_tag :wizard, params[:wizard] %>
 
-  <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :only_required => true } %>
-
-  <%= f.text_field('tag_list', :size => 64) %>
-  <%= content_tag( 'small', _('Separate tags with commas.') + '<br/>' + __("Tags are important to new users, they'll be able to find your new community more easily.") ) %>
+  <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community } %>
 
   <% f.fields_for :image_builder, @community.image do |i| %>
     <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
diff --git a/app/views/profile_editor/_organization.rhtml b/app/views/profile_editor/_organization.rhtml
index 371ac48..7e0a9a1 100644
--- a/app/views/profile_editor/_organization.rhtml
+++ b/app/views/profile_editor/_organization.rhtml
@@ -14,14 +14,6 @@
   </script>
 <% end %>
 
-<div class="formfieldline">
-  <label class="formlabel" for="profile_data_nickname"><%= _('Display name') %></label>
-  <div class="formfield type-text">
-    <%= text_field_tag 'profile_data[nickname]', @profile_data.nickname, :id => 'profile_data_nickname', :size => 30, :maxlength => 16, :onchange => (@environment.enabled?('enable_organization_url_change') ? "updateUrlField(this, 'profile_data_identifier')" : "") %>
-    <em><%= _('A short name by which the organization is know.')%></em>
-  </div>
-</div>
-
 <% if @environment.enabled?('enable_organization_url_change') %>
   <script type="text/javascript">
     function submit_button() {
@@ -45,7 +37,7 @@
 
     <%= hidden_field_tag 'old_profile_identifier', @profile.identifier %>
     <div id="profile-identifier-formitem">
-      <%= labelled_form_field( _('Address'),
+      <%= required labelled_form_field( _('Address'),
             content_tag('code',
               url_for(profile.url).gsub(/#{profile.identifier}$/, '') +
               text_field(:profile_data, :identifier, :onchange => "warn_value_change()", :size => 25)
@@ -66,7 +58,7 @@
     </div>
 <% end %>
 
-  <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'profile_data', :profile => @profile, :only_required => false } %>
+  <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'profile_data', :profile => @profile } %>
 
   <%= labelled_check_box(_('Enable "contact us"'), 'profile_data[enable_contact_us]', "1", @profile.enable_contact_us) if @profile.enterprise? %>
 
diff --git a/app/views/shared/_custom_fields.rhtml b/app/views/shared/_custom_fields.rhtml
deleted file mode 100644
index c72718a..0000000
--- a/app/views/shared/_custom_fields.rhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<% if profile.community? %>
-  <%= optional_field(profile, 'language', f.text_field(:language), only_required) %>
-<% end %>
-
-<%= optional_field(profile, 'description', f.text_area(:description, :rows => 5)) %> <!-- , :maxlength => 10 -->
-<%= optional_field(profile, 'contact_person', f.text_field(:contact_person), only_required) %>
-<%= optional_field(profile, 'contact_email', f.text_field(:contact_email), only_required) %>
-<%= optional_field(profile, 'contact_phone', f.text_field(:contact_phone), only_required) %>
-<%= optional_field(profile, 'legal_form', f.text_field(:legal_form), only_required) %>
-<%= optional_field(profile, 'economic_activity', f.text_field(:economic_activity), only_required) %>
-<%= optional_field(profile, 'management_information', f.text_area(:management_information, :rows => 5), only_required) %>
-<%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(object_name, :address)), only_required) %>
-
-<% if profile.enterprise? %>
-  <%= optional_field(profile, 'business_name', f.text_field(:business_name), only_required) %>
-  <%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code)), only_required) %>
-  <%= optional_field(profile, 'city', f.text_field(:city), only_required) %>
-  <%= optional_field(profile, 'state', f.text_field(:state), only_required) %>
-  <%= optional_field(profile, 'country', select_country(_('Country'), object_name, 'country', {:class => 'type-select'}), only_required) %>
-  <%= optional_field(profile, 'organization_website', f.text_field(:organization_website), only_required) %>
-  <%= optional_field(profile, 'historic_and_current_context', f.text_area(:historic_and_current_context, :rows => 5), only_required) %>
-  <%= optional_field(profile, 'activities_short_description', f.text_area(:activities_short_description, :rows => 5), only_required) %>
-  <%= optional_field(profile, 'acronym', f.text_field(:acronym), only_required) %>
-  <%= optional_field(profile, 'foundation_year', f.text_field(:foundation_year), only_required) %>
-<% end %>
diff --git a/app/views/shared/_organization_custom_fields.rhtml b/app/views/shared/_organization_custom_fields.rhtml
new file mode 100644
index 0000000..22dbf23
--- /dev/null
+++ b/app/views/shared/_organization_custom_fields.rhtml
@@ -0,0 +1,27 @@
+<%= optional_field(profile, 'display_name', f.text_field(:display_name)) %>
+<%= optional_field(profile, 'description', f.text_area(:description, :rows => 5)) %> <!-- , :maxlength => 10 -->
+<%= optional_field(profile, 'contact_person', f.text_field(:contact_person)) %>
+<%= optional_field(profile, 'contact_email', f.text_field(:contact_email)) %>
+<%= optional_field(profile, 'contact_phone', f.text_field(:contact_phone)) %>
+<%= optional_field(profile, 'legal_form', f.text_field(:legal_form)) %>
+<%= optional_field(profile, 'economic_activity', f.text_field(:economic_activity)) %>
+<%= optional_field(profile, 'management_information', f.text_area(:management_information, :rows => 5)) %>
+<%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(object_name, :address))) %>
+<%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code))) %>
+<%= optional_field(profile, 'city', f.text_field(:city)) %>
+<%= optional_field(profile, 'state', f.text_field(:state)) %>
+<%= optional_field(profile, 'country', select_country(_('Country'), object_name, 'country', {:class => 'type-select'})) %>
+<%= optional_field(profile, 'tag_list', f.text_field(:tag_list)) %>
+
+<% if profile.community? %>
+  <%= optional_field(profile, 'language', f.text_field(:language)) %>
+<% end %>
+
+<% if profile.enterprise? %>
+  <%= optional_field(profile, 'business_name', f.text_field(:business_name)) %>
+  <%= optional_field(profile, 'organization_website', f.text_field(:organization_website)) %>
+  <%= optional_field(profile, 'historic_and_current_context', f.text_area(:historic_and_current_context, :rows => 5)) %>
+  <%= optional_field(profile, 'activities_short_description', f.text_area(:activities_short_description, :rows => 5)) %>
+  <%= optional_field(profile, 'acronym', f.text_field(:acronym)) %>
+  <%= optional_field(profile, 'foundation_year', f.text_field(:foundation_year)) %>
+<% end %>
diff --git a/features/location.feature b/features/location.feature
index 4161c6c..a99fb1f 100644
--- a/features/location.feature
+++ b/features/location.feature
@@ -10,7 +10,7 @@ Feature: Location
     And I am logged in as "zezinho"
 
   Scenario: editing my address
-    Given the following Person fields are active
+    Given the following Person fields are active fields
       | address  |
       | country  |
       | state    |
@@ -29,7 +29,7 @@ Feature: Location
       | Rua Marechal Floriano, 28 | BR      | Bahia | Salvador | 40110010 |
 
   Scenario Outline: editing address of collectives
-    Given the following <class> fields are active
+    Given the following <class> fields are active fields
       | address  |
       | country  |
       | state    |
diff --git a/features/organization_custom_fields.feature b/features/organization_custom_fields.feature
new file mode 100644
index 0000000..26ab78a
--- /dev/null
+++ b/features/organization_custom_fields.feature
@@ -0,0 +1,101 @@
+Feature: organization custom fields
+  As a noosfero admin
+  I want to choose what fields are active or required for organizations
+  In order to have more consistency in the system
+
+  Background:
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And I am logged in as "joaosilva"
+    And feature "enterprise_registration" is enabled on environment
+    And I follow "Control panel"
+
+  Scenario Outline: organization active fields are not displayed on creation
+    Given the following <organization> fields are active fields
+      | display_name  |
+      | contact_email |
+      | city          |
+    And I follow "Manage my groups"
+    When I follow <creation_button>
+    Then I should not see "Display name"
+    Then I should not see "Contact email"
+    Then I should not see "City"
+  Examples:
+    | organization  | creation_button             |
+    | community     | "Create a new community"    |
+    | enterprise    | "Register a new enterprise" |
+
+  Scenario Outline: organization active fields are displayed on edition
+    Given the following <organization> fields are active fields
+      | display_name  |
+      | contact_email |
+      | city          |
+    And the following <organization>
+      | name          | identifier    |
+      | Organization  | organization  |
+    And "Joao Silva" is admin of "Organization"
+    And I am on Organization's control panel
+    And I follow <information>
+    Then I should see "Display name"
+    Then I should see "Contact email"
+    Then I should see "City"
+  Examples:
+    | organization  | information                     |
+    | community     | "Community Info and settings"   |
+    | enterprise    | "Enterprise Info and settings"  |
+
+  Scenario Outline: organization required fields are displayed on creation
+    Given the following <organization> fields are required fields
+      | display_name  |
+      | contact_email |
+      | city          |
+    And I follow "Manage my groups"
+    And I follow <creation_button>
+    When I press <confirmation_button>
+    Then I should see "Display name can't be blank"
+    Then I should see "Contact email can't be blank"
+    Then I should see "City can't be blank"
+  Examples:
+    | organization  | creation_button             | confirmation_button |
+    | community     | "Create a new community"    | "Create"            |
+    | enterprise    | "Register a new enterprise" |  "Next"             |
+
+  Scenario Outline: organization required fields are displayed on edition
+    Given the following <organization> fields are required fields
+      | display_name  |
+      | contact_email |
+      | city          |
+    And the following <organization>
+      | name          | identifier    | display_name | contact_email | city |
+      | Organization  |  organization | organization | bla@bleee.com | city |
+    And "Joao Silva" is admin of "Organization"
+    And I am on Organization's control panel
+    And I follow <information>
+    And I fill in the following:
+      | Display name  | |
+      | Contact email | |
+      | City          | |
+    When I press "Save"
+    Then I should see "Display name can't be blank"
+    Then I should see "Contact email can't be blank"
+    Then I should see "City can't be blank"
+  Examples:
+    | organization  | information                     |
+    | community     | "Community Info and settings"   |
+    | enterprise    | "Enterprise Info and settings"  |
+
+  Scenario Outline: organization signup fields are displayed on creation
+    Given the following <organization> fields are signup fields
+      | display_name  |
+      | contact_email |
+      | city          |
+    And I follow "Manage my groups"
+    When I follow <creation_button>
+    Then I should see "Display name"
+    Then I should see "Contact email"
+    Then I should see "City"
+  Examples:
+    | organization  | creation_button             |
+    | community     | "Create a new community"    |
+    | enterprise    | "Register a new enterprise" |
diff --git a/features/register_enterprise.feature b/features/register_enterprise.feature
index 3e0d887..16f6019 100644
--- a/features/register_enterprise.feature
+++ b/features/register_enterprise.feature
@@ -44,8 +44,8 @@ Feature: register enterprise
     When I follow "Register a new enterprise"
     Then I should see "There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions."
 
-  Scenario: some active fields
-    Given the following enterprise fields are active
+  Scenario: some signup fields
+    Given the following enterprise fields are signup fields
       | foundation_year |
       | contact_person  |
       | contact_email   |
@@ -61,7 +61,7 @@ Feature: register enterprise
     And the following states
       | name          |
       | Sample State  |
-    And the following enterprise fields are required
+    And the following enterprise fields are required fields
       | foundation_year |
       | contact_person  |
       | contact_email   |
diff --git a/features/step_definitions/noosfero_steps.rb b/features/step_definitions/noosfero_steps.rb
index 391c42f..6f65c64 100644
--- a/features/step_definitions/noosfero_steps.rb
+++ b/features/step_definitions/noosfero_steps.rb
@@ -144,18 +144,21 @@ Given /^"([^\"]*)" has no articles$/ do |profile|
   (Profile[profile] || Profile.find_by_name(profile)).articles.delete_all
 end
 
-Given /^the following (\w+) fields are (\w+)$/ do |klass, status, table|
+Given /^the following (\w+) fields are (\w+) fields$/ do |klass, status, table|
   env = Environment.default
   fields = table.raw.inject({}) do |hash, line|
-    hash[line.first] = { "active" => 'true' }
-    hash[line.first].merge!({ "required" => 'true'}) if status == "required"
+    hash[line.first] = {}
+    hash[line.first].merge!({ "active" => 'true' })   if status == "active"
+    hash[line.first].merge!({ "required" => 'true'})  if status == "required"
+    hash[line.first].merge!({ "signup" => 'true'})    if status == "signup"
     hash
   end
 
   env.send("custom_#{klass.downcase}_fields=", fields)
   env.save!
+
   if fields.keys != env.send("#{status}_#{klass.downcase}_fields")
-    raise "Not all fields #{status}! Requested: %s; #{status.camelcase}: %s" % [fields.keys.inspect, env.send("#{status}_#{klass.downcase}_fields").inspect] 
+    raise "Not all fields #{status}! Requested: %s; #{status.camelcase}: %s" % [fields.keys.inspect, env.send("#{status}_#{klass.downcase}_fields").inspect]
   end
 end
 
diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb
index 9dc0cfd..11b9b0e 100644
--- a/test/unit/application_helper_test.rb
+++ b/test/unit/application_helper_test.rb
@@ -269,7 +269,7 @@ class ApplicationHelperTest < Test::Unit::TestCase
     assert_equal '', profile_sex_icon(Person.new(:sex => 'male'))
   end
 
-  should 'display field on signup' do
+  should 'display field on person signup' do
     env = Environment.create!(:name => 'env test')
     stubs(:environment).returns(env)
 
@@ -277,9 +277,36 @@ class ApplicationHelperTest < Test::Unit::TestCase
     stubs(:controller).returns(controller)
     controller.expects(:action_name).returns('signup')
 
-    profile = Person.new
-    profile.expects(:signup_fields).returns(['field'])
-    assert_equal 'SIGNUP_FIELD', optional_field(profile, 'field', 'SIGNUP_FIELD')
+    person = Person.new
+    person.expects(:signup_fields).returns(['field'])
+    assert_equal 'SIGNUP_FIELD', optional_field(person, 'field', 'SIGNUP_FIELD')
+  end
+
+  should 'display field on enterprise registration' do
+    env = Environment.create!(:name => 'env test')
+    stubs(:environment).returns(env)
+
+    controller = mock
+    stubs(:controller).returns(controller)
+    controller.stubs(:controller_name).returns('enterprise_registration')
+    controller.stubs(:action_name).returns('index')
+
+    enterprise = Enterprise.new
+    enterprise.expects(:signup_fields).returns(['field'])
+    assert_equal 'SIGNUP_FIELD', optional_field(enterprise, 'field', 'SIGNUP_FIELD')
+  end
+
+  should 'display field on community creation' do
+    env = Environment.create!(:name => 'env test')
+    stubs(:environment).returns(env)
+
+    controller = mock
+    stubs(:controller).returns(controller)
+    controller.stubs(:action_name).returns('new_community')
+
+    community = Community.new
+    community.expects(:signup_fields).returns(['field'])
+    assert_equal 'SIGNUP_FIELD', optional_field(community, 'field', 'SIGNUP_FIELD')
   end
 
   should 'not display field on signup' do
@@ -290,9 +317,36 @@ class ApplicationHelperTest < Test::Unit::TestCase
     stubs(:controller).returns(controller)
     controller.expects(:action_name).returns('signup')
 
-    profile = Person.new
-    profile.expects(:signup_fields).returns([])
-    assert_equal '', optional_field(profile, 'field', 'SIGNUP_FIELD')
+    person = Person.new
+    person.expects(:signup_fields).returns([])
+    assert_equal '', optional_field(person, 'field', 'SIGNUP_FIELD')
+  end
+
+  should 'not display field on enterprise registration' do
+    env = Environment.create!(:name => 'env test')
+    stubs(:environment).returns(env)
+
+    controller = mock
+    stubs(:controller).returns(controller)
+    controller.stubs(:controller_name).returns('enterprise_registration')
+    controller.stubs(:action_name).returns('index')
+
+    enterprise = Enterprise.new
+    enterprise.expects(:signup_fields).returns([])
+    assert_equal '', optional_field(enterprise, 'field', 'SIGNUP_FIELD')
+  end
+
+  should 'not display field on community creation' do
+    env = Environment.create!(:name => 'env test')
+    stubs(:environment).returns(env)
+
+    controller = mock
+    stubs(:controller).returns(controller)
+    controller.stubs(:action_name).returns('new_community')
+
+    community = Community.new
+    community.stubs(:signup_fields).returns([])
+    assert_equal '', optional_field(community, 'field', 'SIGNUP_FIELD')
   end
 
   should 'display active fields' do
@@ -301,7 +355,8 @@ class ApplicationHelperTest < Test::Unit::TestCase
 
     controller = mock
     stubs(:controller).returns(controller)
-    controller.expects(:action_name).returns('edit')
+    controller.stubs(:controller_name).returns('')
+    controller.stubs(:action_name).returns('edit')
 
     profile = Person.new
     profile.expects(:active_fields).returns(['field'])
@@ -314,7 +369,8 @@ class ApplicationHelperTest < Test::Unit::TestCase
 
     controller = mock
     stubs(:controller).returns(controller)
-    controller.expects(:action_name).returns('edit')
+    controller.stubs(:action_name).returns('edit')
+    controller.stubs(:controller_name).returns('')
 
     profile = Person.new
     profile.expects(:active_fields).returns([])
@@ -327,7 +383,8 @@ class ApplicationHelperTest < Test::Unit::TestCase
 
     controller = mock
     stubs(:controller).returns(controller)
-    controller.expects(:action_name).returns('edit')
+    controller.stubs(:controller_name).returns('')
+    controller.stubs(:action_name).returns('edit')
 
     stubs(:required).with('SIGNUP_FIELD').returns('<span>SIGNUP_FIELD</span>')
     profile = Person.new
@@ -336,21 +393,6 @@ class ApplicationHelperTest < Test::Unit::TestCase
     assert_equal '<span>SIGNUP_FIELD</span>', optional_field(profile, 'field', 'SIGNUP_FIELD')
   end
 
-  should 'display required fields on signup even if admin did not marked field to show up in signup' do
-    env = Environment.create!(:name => 'env test')
-    stubs(:environment).returns(env)
-
-    controller = mock
-    stubs(:controller).returns(controller)
-    controller.expects(:action_name).returns('signup')
-
-    stubs(:required).with('SIGNUP_FIELD').returns('<span>SIGNUP_FIELD</span>')
-    profile = Person.new
-    profile.stubs(:required_fields).returns(['field'])
-    profile.stubs(:signup_fields).returns([])
-    assert_equal '<span>SIGNUP_FIELD</span>', optional_field(profile, 'field', 'SIGNUP_FIELD')
-  end
-
   should 'not ask_to_join unless profile defined' do
     stubs(:params).returns({})
 
diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index a6cff84..8888952 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -251,7 +251,7 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_raise ArgumentError do
       env.organization_approval_method = :lalala
     end
-    
+
   end
 
   should 'provide environment name in to_s' do
@@ -371,7 +371,7 @@ class EnvironmentTest < Test::Unit::TestCase
 
     assert_includes env.products, p1
   end
-  
+
   should 'not have person through communities' do
     env = Environment.default
     com = fast_create(Community)
@@ -403,7 +403,7 @@ class EnvironmentTest < Test::Unit::TestCase
   end
 
   should 'have articles and text_articles' do
-    # FIXME 
+    # FIXME
     assert true
     #environment = Environment.create(:name => 'a test environment')
 
@@ -494,15 +494,15 @@ class EnvironmentTest < Test::Unit::TestCase
 
     comm = fast_create(Community)
     e.community_template = comm
-    assert_equal comm, e.community_template 
+    assert_equal comm, e.community_template
 
     person = fast_create(Person)
     e.person_template = person
-    assert_equal person, e.person_template 
+    assert_equal person, e.person_template
 
     enterprise = fast_create(Enterprise)
     e.enterprise_template = enterprise
-    assert_equal enterprise, e.enterprise_template 
+    assert_equal enterprise, e.enterprise_template
   end
 
   should 'not enable ssl by default' do
@@ -545,11 +545,11 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal false, Environment.new.replace_enterprise_template_when_enable
   end
 
-  should 'set custom_person_fields' do
+  should 'set custom_person_fields with its dependecies' do
     env = Environment.new
-    env.custom_person_fields = {'cell_phone' => {'required' => 'true', 'active' => 'true'},'comercial_phone'=>  {'required' => 'true', 'active' => 'true'}}
+    env.custom_person_fields = {'cell_phone' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'comercial_phone'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
 
-    assert_equal({'cell_phone' => {'required' => 'true', 'active' => 'true'},'comercial_phone'=>  {'required' => 'true', 'active' => 'true'}}, env.custom_person_fields)
+    assert_equal({'cell_phone' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}, 'comercial_phone'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => 'true', 'signup' => 'true'}}, env.custom_person_fields)
   end
 
   should 'have no custom_person_fields by default' do
@@ -561,7 +561,7 @@ class EnvironmentTest < Test::Unit::TestCase
     Person.stubs(:fields).returns(['cell_phone', 'comercial_phone'])
 
     env.custom_person_fields = { 'birth_date' => {'required' => 'true', 'active' => 'true'}, 'cell_phone' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'cell_phone' => {'required' => 'true', 'active' => 'true'}}, env.custom_person_fields)
+    assert_equal({'cell_phone' => {'required' => 'true','signup' => 'true',  'active' => 'true'}}, env.custom_person_fields)
     assert ! env.custom_person_fields.keys.include?('birth_date')
   end
 
@@ -570,7 +570,7 @@ class EnvironmentTest < Test::Unit::TestCase
     Person.stubs(:fields).returns(['cell_phone', 'schooling'])
 
     env.custom_person_fields = { 'schooling' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'schooling' => {'required' => 'true', 'active' => 'true'}, 'schooling_status' => {'required' => 'true', 'active' => 'true'}}, env.custom_person_fields)
+    assert_equal({'schooling' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}, 'schooling_status' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}}, env.custom_person_fields)
     assert ! env.custom_person_fields.keys.include?('birth_date')
   end
 
@@ -618,11 +618,11 @@ class EnvironmentTest < Test::Unit::TestCase
     end
   end
 
-  should 'set custom_enterprises_fields' do
+  should 'set custom_enterprise_fields with its dependencies' do
     env = Environment.new
-    env.custom_enterprise_fields = {'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}
+    env.custom_enterprise_fields = {'contact_person' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'contact_email'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
 
-    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}, env.custom_enterprise_fields)
+    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}, 'contact_email'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => 'true', 'signup' => 'true'}} , env.custom_enterprise_fields)
   end
 
   should 'have no custom_enterprise_fields by default' do
@@ -634,7 +634,7 @@ class EnvironmentTest < Test::Unit::TestCase
     Enterprise.stubs(:fields).returns(['contact_person', 'comercial_phone'])
 
     env.custom_enterprise_fields = { 'contact_email' => {'required' => 'true', 'active' => 'true'}, 'contact_person' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'}}, env.custom_enterprise_fields)
+    assert_equal({'contact_person' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}}, env.custom_enterprise_fields)
     assert ! env.custom_enterprise_fields.keys.include?('contact_email')
   end
 
@@ -661,11 +661,11 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal ['contact_email'], env.required_enterprise_fields
   end
 
-  should 'set custom_communitys_fields' do
+  should 'set custom_community_fields with its dependencies' do
     env = Environment.new
-    env.custom_community_fields = {'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}
+    env.custom_community_fields = {'contact_person' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'contact_email'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
 
-    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}, env.custom_community_fields)
+    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}, 'contact_email'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => 'true', 'signup' => 'true'}} , env.custom_community_fields)
   end
 
   should 'have no custom_community_fields by default' do
@@ -677,7 +677,7 @@ class EnvironmentTest < Test::Unit::TestCase
     Community.stubs(:fields).returns(['contact_person', 'comercial_phone'])
 
     env.custom_community_fields = { 'contact_email' => {'required' => 'true', 'active' => 'true'}, 'contact_person' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'}}, env.custom_community_fields)
+    assert_equal({'contact_person' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}}, env.custom_community_fields)
     assert ! env.custom_community_fields.keys.include?('contact_email')
   end
 
--
libgit2 0.21.2