diff --git a/public/mpog-institution-validations.js b/public/mpog-institution-validations.js
index 26e4dbc..d1b07b2 100644
--- a/public/mpog-institution-validations.js
+++ b/public/mpog-institution-validations.js
@@ -198,6 +198,10 @@
     jQuery(this).parent().remove();
   }
 
+  function add_mask_to_form_items() {
+    jQuery(".intitution_cnpj_field").mask("99.999.999/9999-99");
+  }
+
   function set_events() {
     jQuery("#create_institution_link").click(open_create_institution_modal);
 
@@ -213,6 +217,8 @@
 
     jQuery(".remove-institution").click(remove_institution);
 
+    add_mask_to_form_items();
+
     institution_autocomplete();
   }
 
diff --git a/views/institution_editor_extras.html.erb b/views/institution_editor_extras.html.erb
index 60620db..d08cc15 100644
--- a/views/institution_editor_extras.html.erb
+++ b/views/institution_editor_extras.html.erb
@@ -1,7 +1,7 @@
 <h2><%= _('Institution Information') %></h2>
 
 <div class="formfield type-text">
-  <%= labelled_text_field(_("CNPJ"), 'institution[cnpj]', context.profile.institution.cnpj, :class=>"formlabel") %>
+  <%= labelled_text_field(_("CNPJ"), 'institution[cnpj]', context.profile.institution.cnpj, :class=>"formlabel intitution_cnpj_field", :placeholder=>"99.999.999/9999-99") %>
 </div>
 
 <span class='required-field'>
diff --git a/views/mpog_software_plugin/create_institution.html.erb b/views/mpog_software_plugin/create_institution.html.erb
index 842cf84..4167fe8 100644
--- a/views/mpog_software_plugin/create_institution.html.erb
+++ b/views/mpog_software_plugin/create_institution.html.erb
@@ -33,7 +33,7 @@
       <span class='required-field'>
         <div class="formfield type-text">
           <%= inst.label("cnpj" ,_("CNPJ"), :class=>"formlabel") %>
-          <%= required inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99") %>
+          <%= required inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field") %>
         </div>
       </span>
 
diff --git a/views/search/search_forms/_institution_fields.html.erb b/views/search/search_forms/_institution_fields.html.erb
index 7632ccf..9de1c3e 100644
--- a/views/search/search_forms/_institution_fields.html.erb
+++ b/views/search/search_forms/_institution_fields.html.erb
@@ -23,7 +23,7 @@
 
   <tr>
     <td> <%= label_tag("intitution_cnpj", _("cnpj"))%> </td>
-    <td> <%= text_field_tag(:intitution_cnpj, nil, :placeholder=>"99.999.999/9999-99") %> </td>
+    <td> <%= text_field_tag(:intitution_cnpj, nil, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field") %> </td>
   </tr>
 
   <tr>
--
libgit2 0.21.2