diff --git a/ce/ce0400a.uml b/ce/ce0400a.uml
index 6c1fc442b..14fe205dd 100755
--- a/ce/ce0400a.uml
+++ b/ce/ce0400a.uml
@@ -5,12 +5,10 @@ TOOLBAR "topbar" 0 0 0 2
 BUTTON DLG_OK 10 2
 BEGIN
   PROMPT -12 -11 ""
+  PICTURE TOOL_SAVEREC
 END
 
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -11 ""
-END
+#include <helpbar.h>
 
 ENDPAGE
 
@@ -72,12 +70,13 @@ BEGIN
   PROMPT 2 4 "Gruppo "
   FIELD GRUPPOCORR
   FLAGS "Z"
-  USE CCB KEY 1        
+  USE CCB
   JOIN %CGR ALIAS 106 INTO CODTAB==CODTAB[5,6]
   JOIN %CAT ALIAS 107 INTO CODTAB==CODTAB[5,10]
   INPUT CODTAB[1,4] F_ESERCORR SELECT
   INPUT CODTAB[5,6] F_GRUPPOCORR
   INPUT CODTAB[7,10] F_SPECIECORR
+  DISPLAY "Esercizio" CODTAB[1,4]    
   DISPLAY "Gruppo" CODTAB[5,6]    
   DISPLAY "Specie" CODTAB[7,10]
   DISPLAY "Descrizione@60" 107@->S0
diff --git a/ce/ce1500.cpp b/ce/ce1500.cpp
index 364a31f7e..05d9c3951 100755
--- a/ce/ce1500.cpp
+++ b/ce/ce1500.cpp
@@ -308,19 +308,13 @@ int TMov_qmask::create_fields(int x, int y, short key_id)
     switch(tipo_campo)
     {
     case _wordfld:      add_number (kid, 0, prompt, x, i+y, len, search ? "BU" : "U");  break;
-
     case _intfld :
     case _longfld:      add_number (kid, 0, prompt, x, i+y, len, search ? "B" : "");  break;
-
     case _intzerofld:
     case _longzerofld:  add_number (kid, 0, prompt, x, i+y, len, search ? "BZ" : "Z");  break;
-
     case _realfld:      add_number (kid, 0, prompt, x, i+y, len, "", ndec_campo);  break;
-
     case _datefld:      add_date (kid, 0, prompt, x, i+y, search ? "B" : "");  break;
-
     case _memofld:      add_zoom(kid, 0, prompt, x, i+y, 50);  break;
-      
     default      :      add_string (kid, 0, prompt, x, i+y, len, search ? "BU" : "");  break;
     }
 
@@ -473,6 +467,20 @@ bool TMov_emask::on_field_event(TOperable_field& o, TField_event e, long jolly)
 {
   switch (o.dlg())
   {
+  case F_ESERCIZIO:
+    if (e == fe_init)
+    { 
+      int esercizio;
+      TString4 gruppo, specie;
+      TDitta_cespiti& dc = ditta_cespiti();
+      dc.get_attivita(esercizio, gruppo, specie);
+      if (gruppo.full())
+      {
+        set(F_GRUPPO, gruppo);
+        set(F_SPECIE, specie.rtrim(), 0x2); // Output description
+      }
+    }
+    break;
   case F_CODMOV:
     if ((e == fe_modify || e == fe_init))
     {