diff --git a/package-lock.json b/package-lock.json
index 46888b7..a287878 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4014,12 +4014,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4039,7 +4041,8 @@
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -4187,6 +4190,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -7234,6 +7238,14 @@
       "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-3.2.0.tgz",
       "integrity": "sha512-oLSLIWZgRiIfcuxyXLMZUOhX3wZtg6lpuMbdo/0UzMDg2bSOe1XPskcKZ/iuOa3FOlU9rjuYMzswHYYV5f/QCA=="
     },
+    "ngx-mask": {
+      "version": "7.6.5",
+      "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-7.6.5.tgz",
+      "integrity": "sha512-wABQ+D+4I+L9V8nUOxVZqTvaEUnDib6R2SJSYKqxBQaJxcLQMmdffYHj2ccs65g/88XT4t1jN/SvY4fhQCO4Gg==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -8235,7 +8247,7 @@
         },
         "yargs": {
           "version": "3.32.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+          "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
           "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
           "requires": {
             "camelcase": "^2.0.1",
diff --git a/package.json b/package.json
index e405c33..cc0eef9 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "jquery": "^3.3.1",
     "js-marker-clusterer": "^1.0.0",
     "ngx-bootstrap": "^3.0.1",
+    "ngx-mask": "^7.6.5",
     "rxjs": "6.3.3",
     "zone.js": "~0.8.26"
   },
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index fd25d95..f816f26 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -17,6 +17,8 @@ import { EntidadeService } from './entidade.service';
 import { AgmCoreModule } from '@agm/core';
 import { AgmJsMarkerClustererModule } from '@agm/js-marker-clusterer';
 
+import {NgxMaskModule} from 'ngx-mask';
+
 import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import { TooltipModule } from 'ngx-bootstrap/tooltip';
 import { ModalModule } from 'ngx-bootstrap/modal';
@@ -42,6 +44,7 @@ import { ModalEntityProfileComponent } from './maps/modal-entity-profile/modal-e
     FormsModule,
     ReactiveFormsModule,
     HttpClientModule,
+    NgxMaskModule.forRoot(),
     BsDropdownModule.forRoot(),
     TooltipModule.forRoot(),
     ModalModule.forRoot(),
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index 14b9159..d8a6f1d 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -72,12 +72,14 @@ <h4 class="modal-title text-center" *ngIf="registrationSteps == 4">Entidade Soci
 
 			<div class="input-group form-group" *ngIf="registrationSteps == 1">
 
-				<input type="text" id="cnpj" formControlName="cnpj" maxlength="14" name="cnpj" #cnpj
-					class="form-control form-control-lg" placeholder="CNPJ - apenas números" aria-describedby="basic-addon2">
+				<input type="text" id="cnpj" formControlName="cnpj" name="cnpj" 
+					class="form-control form-control-lg" placeholder="CNPJ - apenas números"
+					aria-describedby="basic-addon2" maxlength="18" mask='00.000.000/0000-00'>
 
 				<div class="input-group-append">
-					<button class="btn btn-secondary" type="button" (click)="buscaCnpj(cnpj.value);"><i
-							class="fas fa-search"></i></button>
+					<button class="btn btn-secondary" type="button" (click)="buscaCnpj();"
+							[disabled]="!formCadastro.controls['cnpj'].valid">
+						<i class="fas fa-search"></i></button>
 				</div>
 			</div>
 
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 39b3803..d9f0897 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -27,8 +27,6 @@ export class HomeComponent implements OnInit {
 
 	public modalRef: BsModalRef;
 	public customPatterns = {'0': { pattern: new RegExp('\[0-9\]')}};
-	
-	//Validators.pattern(new RegExp('^1234$'))
 
 	public formCadastro: FormGroup;
 
@@ -37,7 +35,7 @@ export class HomeComponent implements OnInit {
 		private authService: AuthService, private entidadeService: EntidadeService) {
 
 		this.formCadastro = new FormGroup({
-			cnpj: new FormControl('', [Validators.required]),
+			cnpj: new FormControl('', [Validators.required, Validators.pattern(new RegExp('^\\d{14}$'))]),
 			razaoSocial: new FormControl(''),
 			atividadePrincipal: new FormControl(''),
 			areaAtuacao: new FormControl('selecione', [Validators.required]),
@@ -64,9 +62,15 @@ export class HomeComponent implements OnInit {
 		this.modalRef = this.modalService.show(templateEntityRegister, { backdrop: 'static', keyboard: false });
 	}
 
-	buscaCnpj(value: any) {
+	buscaCnpj() {
+
+		let cnpj = this.formCadastro.controls['cnpj'].value;
 
-		this.BuscaCnpjService.getCnpj(value).subscribe((res) => {
+		this.BuscaCnpjService.getCnpj(cnpj).subscribe((res) => {
+
+			//TODO - Validar natureza juridica cnpj
+			//Validators.pattern(new RegExp('^399-9'))
+			//Validators.pattern(new RegExp('^306-9'))
 
 			//concat for google maps
 			const endereco = res['logradouro'] + ', ' + res['numero'] + ' - ' + res['bairro'] + ', ' + res['municipio'] + '-' + res['uf'];
@@ -100,8 +104,6 @@ export class HomeComponent implements OnInit {
 	backStep() {
 		if (this.registrationSteps === 3) {
 			this.registrationSteps = 2;
-			console.log(this.formCadastro)
-			console.log(this.formCadastro.controls['areaAtuacao'].value)
 		} else if (this.registrationSteps === 2) {
 			this.formCadastro.reset();
 			this.formCadastro.controls['areaAtuacao'].setValue('selecione');
@@ -123,7 +125,7 @@ export class HomeComponent implements OnInit {
 	}
 
 	onSubmit() {
-console.log(this.formCadastro)
+		
 		let email = this.formCadastro.controls['responsavel'].value['emailResponsavel'];
 		let senha = this.formCadastro.controls['responsavel'].value['senhaOk'];