diff --git a/app/views/account/accept_terms.rhtml b/app/views/account/accept_terms.rhtml
index d6ed685..42278a2 100644
--- a/app/views/account/accept_terms.rhtml
+++ b/app/views/account/accept_terms.rhtml
@@ -1,3 +1,15 @@
+<script type="text/javascript">
+  function toggle_submit_button(id, enabled) {
+    button = $(id)
+    if (enabled){
+      button.className = button.className.replace(/disabled/, '')
+      button.enable()
+    } else  {
+      button.className += ' disabled'
+      button.disable()
+    }
+  }
+</script>
 <div class=activation-box>
   <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
 
@@ -7,10 +19,10 @@
     <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
     <%= hidden_field_tag :answer, params[:answer] %>
 
-    <%= labelled_check_box _('I read the terms of use and accepted them'), :terms_accepted %>
+    <%= labelled_check_box _('I read the terms of use and accepted them'), :terms_accepted, '1', false, :onclick => 'toggle_submit_button("submit-accept-terms", this.checked)' %>
     <% button_bar do %>
       <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
-      <%= submit_button 'forward', _('Continue') %>
+      <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
     <% end %>
   <% end %>
 </div>
diff --git a/app/views/account/activate_enterprise.rhtml b/app/views/account/activate_enterprise.rhtml
index d02986b..b686e8b 100644
--- a/app/views/account/activate_enterprise.rhtml
+++ b/app/views/account/activate_enterprise.rhtml
@@ -3,8 +3,8 @@
 
 <%= error_messages_for :user %>
 
-<p><%= _('Well, now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
-<p><%= _('Do you have a user account?') %></p>
+<p><%= _('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
+<p><%= _('Do you have a personal user account in the system?') %></p>
 
 <div id="enterprise-activation-create-user-or-login-button">
   <%= button_to_function 'login', _('Yes'), "$('enterprise-activation-create-user-form').hide(); $('enterprise-activation-login-form').show()" %> 
@@ -12,10 +12,17 @@
 </div>
 
 <div id="enterprise-activation-create-user-form" style="display: none">
+  <h3><%= _('Personal signup form') %></h3>
   <%= render :partial => 'signup_form' %>
+  <p><%= message = _('<b>Warning</b>: this form is for your personal information, not of your enterprise. So you will have a personal account that can manage your enterprise.') %></p>
 </div>
 
 <div id="enterprise-activation-login-form" style="display: none">
+
+  <h3><%= _('Enter you user name and password') %></h3>
   <%= render :partial => 'login_form' %>
+  <p><%= message %></p>
 </div>
+
+
 </div>
diff --git a/app/views/account/activation_question.rhtml b/app/views/account/activation_question.rhtml
index 5c56f7d..4836fc3 100644
--- a/app/views/account/activation_question.rhtml
+++ b/app/views/account/activation_question.rhtml
@@ -26,7 +26,11 @@
   <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2>
   <% form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %> 
 
-    <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? _('What year your enterprise was founded?') : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer', :help => help=_('We need to be sure that this is your enterprise'))) %>
+  <p>  <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
+
+  <p><%= _("This is a question to know if you is really part of this enterprise. Pay atention because you has only one chance to answer rigth and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
+
+  <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? _('What year your enterprise was founded?') : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer', :help => help=_('We need to be sure that this is your enterprise'))) %>
 
     <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
 
diff --git a/public/stylesheets/controller_account.css b/public/stylesheets/controller_account.css
new file mode 100644
index 0000000..7691c2a
--- /dev/null
+++ b/public/stylesheets/controller_account.css
@@ -0,0 +1,7 @@
+.button.disabled {
+  opacity: 0.5;
+}
+
+#content .icon-forward.disabled { 
+  background-image: url('/designs/icons/default/go-right-disabled-HC.gif');
+}
--
libgit2 0.21.2