diff --git a/ca/ca0300a.uml b/ca/ca0300a.uml
index 1d0cf0733..e955017f2 100755
--- a/ca/ca0300a.uml
+++ b/ca/ca0300a.uml
@@ -314,8 +314,6 @@ END
 BOOLEAN F_USE_PDCC
 BEGIN
   PROMPT 2 11 "Utilizza il piano dei conti contabile"
-  MESSAGE TRUE HIDE,5@
-  MESSAGE FALSE SHOW,5@
   FIELD UsePdcc
 END
 
@@ -328,7 +326,6 @@ END
 TEXT -1
 BEGIN
   PROMPT 27 12 "Descrizione"
-  GROUP 5
 END
 
 STRING F_PDCI_1 20
@@ -337,14 +334,12 @@ BEGIN
   MESSAGE EMPTY CLEAR,F_PDCI_2|CLEAR,F_DESPDCI_2|K_TAB,F_PDCI_2|RESET,F_DESPDCI_1
   MESSAGE ENABLE,F_PDCI_2|ENABLE,F_DESPDCI_2
   FIELD Pdci(1)
-  GROUP 5
 END
 
 STRING F_DESPDCI_1 50
 BEGIN
   PROMPT 27 13 ""
   FIELD PdciDes(1)
-  GROUP 5
 END
 
 STRING F_PDCI_2 20
@@ -354,14 +349,12 @@ BEGIN
   MESSAGE ENABLE,F_PDCI_3|ENABLE,F_DESPDCI_3
   FLAGS "G"
   FIELD Pdci(2)
-  GROUP 5
 END
 
 STRING F_DESPDCI_2 50
 BEGIN
   PROMPT 27 14 ""
   FIELD PdciDes(2)
-  GROUP 5
 END
 
 STRING F_PDCI_3 20
@@ -371,14 +364,12 @@ BEGIN
   MESSAGE ENABLE,F_PDCI_4|ENABLE,F_DESPDCI_4
   FLAGS "G"
   FIELD Pdci(3)
-  GROUP 5
 END
 
 STRING F_DESPDCI_3 50
 BEGIN
   PROMPT 27 15 ""
   FIELD PdciDes(3)
-  GROUP 5
 END
 
 STRING F_PDCI_4 20
@@ -387,21 +378,18 @@ BEGIN
   MESSAGE EMPTY RESET,F_DESPDCI_4
   FLAGS "G"
   FIELD Pdci(4)
-  GROUP 5
 END
 
 STRING F_DESPDCI_4 50
 BEGIN
   PROMPT 27 16 ""
   FIELD PdciDes(4)
-  GROUP 5
 END
 
 BOOLEAN F_PDCREQ
 BEGIN
   PROMPT 2 17 "Obbligatorio nelle righe dei movimenti"
   FIELD PdciRequired
-  GROUP 5
 END
 
 ENDPAGE
diff --git a/ca/ca0400.cpp b/ca/ca0400.cpp
index c08f83e9a..40c3a396f 100755
--- a/ca/ca0400.cpp
+++ b/ca/ca0400.cpp
@@ -29,17 +29,17 @@ protected:
 bool TAnalisi_app::create()
 {
   TConfig_anal cfg;
-  const bool use_cg0 = cfg.get_bool("UsePdcc");
-  if (use_cg0)
-  {
-    TExternal_app app("cg0 -0");
-    app.run(true);
-    return false;
-  }
-  else
-  {
-    const TString& pdc = cfg.get("Pdci", NULL, 1);
-    if (pdc.blank())
+  const TString& pdc = cfg.get("Pdci", NULL, 1);
+  if (pdc.blank())
+	{
+	  const bool use_cg0 = cfg.get_bool("UsePdcc");
+	  if (use_cg0)
+	  {
+			TExternal_app app("cg0 -0");
+	    app.run(true);
+			return false;
+		}
+		else
       return error_box(TR("Il piano dei conti analitico non e' stato configurato"));
   }
   return TAnal_app::create();
diff --git a/ca/ca0400a.uml b/ca/ca0400a.uml
index ebd0e0657..567702478 100755
--- a/ca/ca0400a.uml
+++ b/ca/ca0400a.uml
@@ -10,12 +10,12 @@ PAGE "Piano dei conti" -1 -1 80 20
 
 GROUPBOX DLG_NULL 78 6
 BEGIN
-  PROMPT 1 0 ""
+  PROMPT 2 0 ""
 END
 
 RADIOBUTTON F_SEZSALDI 1 16
 BEGIN
-  PROMPT 1 7 "Sezione saldi"
+  PROMPT 2 7 "Sezione saldi"
   ITEM "D|Dare"
   ITEM "A|Avere"
   FIELD SEZSALDI
@@ -23,7 +23,7 @@ END
 
 BOOLEAN F_SOSPESO
 BEGIN
-  PROMPT 1 12 "Sospeso"
+  PROMPT 2 12 "Sospeso"
   FIELD SOSPESO
 END
 
diff --git a/ca/ca0500a.uml b/ca/ca0500a.uml
index e7e58bb51..5ada258de 100755
--- a/ca/ca0500a.uml
+++ b/ca/ca0500a.uml
@@ -8,7 +8,7 @@ PAGE "Centri di Costo" -1 -1 64 6
 
 GROUPBOX DLG_NULL 78 6
 BEGIN
-  PROMPT 1 0 "@bCodici"
+  PROMPT 2 0 "@bCodici"
 END
 
 MEMO F_CDC_DESCRAGG 78 6
diff --git a/ca/ca1400.cpp b/ca/ca1400.cpp
index 5856b363a..bbe4be754 100755
--- a/ca/ca1400.cpp
+++ b/ca/ca1400.cpp
@@ -44,19 +44,21 @@ public:
 bool TPrint_pdc::create()
 {
   TConfig_anal cfg;
-  const bool use_cg1 = cfg.get_bool("UsePdcc");
-  if (use_cg1)
-  {
-    TExternal_app app("cg1 -0");
-    app.run(true);
-    return false;
-  }
-  else
-  {
-    const TString& pdc = cfg.get("Pdci", NULL, 1);
-    if (pdc.blank())
-      return error_box(TR("Il piano dei conti analitico non e' stato configurato"));
-  }
+  const TString& pdc = cfg.get("Pdci", NULL, 1);
+
+  if (pdc.blank())
+	{
+		const bool use_cg1 = cfg.get_bool("UsePdcc");
+	
+		if (use_cg1)
+		{
+			TExternal_app app("cg1 -0");
+			app.run(true);
+			return false;
+		}
+		else
+			return error_box(TR("Il piano dei conti analitico non e' stato configurato"));
+	}
   return TSkeleton_application::create();
 }
 
diff --git a/ca/calib01.cpp b/ca/calib01.cpp
index 2830bdde4..5c7a99c39 100755
--- a/ca/calib01.cpp
+++ b/ca/calib01.cpp
@@ -733,10 +733,11 @@ int TSimple_anal_msk::create_key_fields()
   const int logic = get_logicnum();
   const short kid = get_field_id(0, 1);
   const short did = get_field_id(0, 2);
-  const int x = compute_offset()+2;
+  const int x = compute_offset()+3;
   const int y = 1;
   const int n = ca_create_fields(*this, logic, x, y, kid, did, 0x1);
   const int m = ca_create_fields(*this, logic, x, y, kid, did, 0x2);
+	first_focus(kid);
   return n;
 }
 
@@ -1010,8 +1011,7 @@ void TAnal_app::init_key_fields() const
       e.check(STARTING_CHECK);
 
       TString80 key2; 
-      if (i == maxlev-1) 
-        key2 << _msk->fieldref(0, 2);
+			key2 << _msk->fieldref(0, 2);
       d.set_field(key2);
       d.show();
       d.enable();
@@ -1049,6 +1049,7 @@ void TAnal_app::init_query_mode(TMask& mask)
     TEdit_field& d = m.efield(did);
     d.show(); d.enable();
     d.enable_check();
+		d.set_field("");
   }
 }