diff --git a/src/js/controller.js b/src/js/controller.js
index aea04b7..fd560ee 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -1,9 +1,9 @@
 angular.module('focaBusquedaCliente')
     .controller('focaBusquedaClienteModalController', [
         '$uibModalInstance', 'focaBusquedaClienteService', '$scope', '$filter',
-        '$uibModal', 'focaModalService',
+        '$uibModal', 'focaModalService', '$timeout',
         function($uibModalInstance, focaBusquedaClienteService, $scope, $filter,
-            $uibModal, focaModalService) {
+            $uibModal, focaModalService, $timeout) {
 
             $scope.filters = '';
             $scope.primerBusqueda = false;
@@ -14,6 +14,8 @@ angular.module('focaBusquedaCliente')
             $scope.currentPageClientes = [];
             $scope.selectedClientes = -1;
             $scope.ingreso = false;
+            $scope.regexCuit = new RegExp(/\b(20|23|24|27|30|33|34)(\D)?[0-9]{8}(\D)?[0-9]/g);
+
 
             $scope.cliente = {
                 COD: 0,
@@ -138,9 +140,11 @@ angular.module('focaBusquedaCliente')
                             templateUrl: 'modal-provincias.html',
                             controller: 'focaModalProvinciaController',
                             size: 'md',
-                            resolve: {filters: function() {
-                                return $scope.cliente.provincia;
-                            }}
+                            resolve: {
+                                filters: function() {
+                                    return $scope.cliente.provincia.NOMBRE;
+                                }
+                            }
                         }
                     );
                     modalInstance.result.then(function(provincia) {
@@ -303,8 +307,6 @@ angular.module('focaBusquedaCliente')
 
             $scope.guardar = function() {
 
-                if(!validarForm()) return;
-
                 $scope.cliente.PCX = $scope.cliente.provincia.ID;
                 $scope.cliente.LOX = $scope.cliente.localidad.ID;
                 $scope.cliente.IVA = $scope.cliente.iva.ID;
@@ -391,14 +393,5 @@ angular.module('focaBusquedaCliente')
                     $scope.selectedClientes = 0;
                 }
             }
-
-            function validarForm() {
-                var regexCuit = new RegExp(/\b(20|23|24|27|30|33|34)(\D)?[0-9]{8}(\D)?[0-9]/g);
-                if(!regexCuit.test($scope.cliente.CUIT)) {
-                    focaModalService.alert('Número de CUIT inválido')
-                    return false;
-                }
-                return true;
-            }
         }
     ]);
diff --git a/src/views/foca-busqueda-cliente-modal.html b/src/views/foca-busqueda-cliente-modal.html
index 7883178..d839a83 100644
--- a/src/views/foca-busqueda-cliente-modal.html
+++ b/src/views/foca-busqueda-cliente-modal.html
@@ -1,11 +1,11 @@
 <div class="modal-header py-1">
     <div class="row w-100">
-        <div class="col-lg-6">
+        <div class="col-lg-4">
             <h5 class="modal-title my-1" ng-hide="ingreso">Búsqueda de Cliente</h5>
             <h5 class="modal-title my-1" ng-show="ingreso">Crear Cliente</h5>
         </div>
         <div ng-show="ingreso" class="col-lg-6">
-            <div class="custom-control custom-checkbox">
+            <div class="custom-control custom-checkbox mt-2">
                 <input 
                     type="checkbox"
                     class="custom-control-input" 
@@ -14,11 +14,12 @@
                 <label class="custom-control-label" for="checkProspecto">¿Es prospecto?</label>
             </div>
         </div>
-        <div class="input-group col-lg-6 pr-0 my-2">
+        <div class="input-group col-lg-6 offset-lg-2 pr-0 my-2">
             <button 
                 class="btn btn-outline-primary mr-2"
                 ng-click="ingreso = true"
-                ng-show="!ingreso">
+                ng-show="!ingreso"
+                title="Nuevo">
                 <i class="fa fa-plus" aria-hidden="true"></i>
             </button>
             <input
@@ -106,7 +107,6 @@
                             type="text"
                             class="form-control form-control-sm"
                             ng-model="cliente.codigo"
-                            ng-required="true"
                             readonly
                         />
                     </div>
@@ -255,7 +255,8 @@
                                 class="custom-control-input"
                                 id="checkDistribuidor"
                                 ng-model="cliente.ES_MAY"
-                                checked>
+                                checked
+                                disabled="disabled">
                             <label class="custom-control-label" for="checkDistribuidor">¿Este cliente es distribuidor?</label>
                         </div>
                     </div>
@@ -320,6 +321,8 @@
                                 placeholder="Ingrese CUIT"
                                 ng-model="cliente.CUIT"
                                 ng-required="true"
+                                ng-pattern="regexCuit"
+                                ng-maxlength="13"
                                 teclado-virtual>
                         </div>
                     </div>
@@ -404,5 +407,10 @@
         </ul>
     </nav>
     <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
-    <button class="btn btn-sm btn-primary" type="button" ng-show="ingreso" ng-click="guardar()">Guardar</button>
+    <button 
+        class="btn btn-sm btn-primary"
+        type="button"
+        ng-show="ingreso" 
+        ng-click="guardar()"
+        ng-disabled="!formCliente.$valid">Guardar</button>
 </div>