diff --git a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html
index 3587a63..388fc7d 100644
--- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.html
+++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.html
@@ -110,7 +110,9 @@
 <!-- --------------------------------------------------------------------------------------------- -->
 
 <!-- Button trigger modal -->
-<button type="button" class="ds-btn ds-btn--primary" data-toggle="modal" data-target="#crearEncuesta">Crear encuesta</button>
+<button type="button" class="ds-btn ds-btn--primary" (click)="resetForm()" data-toggle="modal" data-target="#crearEncuesta">
+  Crear encuesta
+</button>
 
 <!-- Modal -->
 <div
@@ -132,11 +134,6 @@
           <div>
             <jhi-alert-error></jhi-alert-error>
 
-            <div class="form-group" [hidden]="editForm.get('id')!.value == null">
-              <label class="form-control-label" jhiTranslate="global.field.id" for="field_id">ID</label>
-              <input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" />
-            </div>
-
             <div class="form-group">
               <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.nombre" for="field_nombre">Nombre</label>
               <input type="text" class="form-control" name="nombre" id="field_nombre" data-cy="nombre" formControlName="nombre" />
@@ -202,7 +199,7 @@
             <div class="form-group">
               <label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.categoria" for="field_categoria">Categoría</label>
               <select class="form-control" id="field_categoria" data-cy="categoria" name="categoria" formControlName="categoria">
-                <option [ngValue]="null"></option>
+                <option [ngValue]="null" selected></option>
                 <option
                   [ngValue]="
                     categoriaOption.id === editForm.get('categoria')!.value?.id ? editForm.get('categoria')!.value : categoriaOption
@@ -212,10 +209,21 @@
                   {{ categoriaOption.nombre }}
                 </option>
               </select>
+              <div *ngIf="editForm.get('categoria')!.invalid && (editForm.get('categoria')!.dirty || editForm.get('categoria')!.touched)">
+                <small
+                  class="form-text text-danger"
+                  *ngIf="editForm.get('categoria')?.errors?.required"
+                  jhiTranslate="entity.validation.required"
+                >
+                  This field is required.
+                </small>
+              </div>
             </div>
           </div>
         </div>
         <div class="modal-footer">
+          <input id="createAnother" type="checkbox" (change)="createAnotherChange($event)" />
+          <label for="createAnother">Crear otra</label>
           <button id="cancelBtn" type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal">
             <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
           </button>
@@ -223,8 +231,8 @@
             type="submit"
             id="save-entity"
             data-cy="entityCreateSaveButton"
-            [disabled]="editForm.invalid || isSaving"
             class="ds-btn ds-btn--primary"
+            [disabled]="editForm.invalid || isSaving"
           >
             <span jhiTranslate="entity.action.create">Create</span>
           </button>
diff --git a/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts b/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts
index c0e9da8..226fcf5 100644
--- a/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts
+++ b/src/main/webapp/app/entities/encuesta/list/encuesta.component.ts
@@ -56,6 +56,8 @@ export class EncuestaComponent implements OnInit {
     // usuarioExtra: [],
   });
 
+  createAnother: Boolean = false;
+
   constructor(
     protected encuestaService: EncuestaService,
     protected modalService: NgbModal,
@@ -66,6 +68,10 @@ export class EncuestaComponent implements OnInit {
     protected accountService: AccountService
   ) {}
 
+  resetForm(): void {
+    this.editForm.reset();
+  }
+
   loadAll(): void {
     this.isLoading = true;
 
@@ -164,12 +170,19 @@ export class EncuestaComponent implements OnInit {
     );
   }
 
+  createAnotherChange(event: any) {
+    this.createAnother = event.target.checked;
+  }
+
   protected onSaveSuccess(): void {
     // this.previousState();
     //  ($('#crearEncuesta') as any).modal('hide');
+    this.resetForm();
     this.encuestas = [];
     this.loadAll();
-    $('#cancelBtn').click();
+    if (!this.createAnother) {
+      $('#cancelBtn').click();
+    }
   }
 
   protected onSaveError(): void {