diff --git a/cg/cg2100n.uml b/cg/cg2100n.uml
index b5e37ccf9..2fe56c0e8 100755
--- a/cg/cg2100n.uml
+++ b/cg/cg2100n.uml
@@ -1,6 +1,6 @@
 #include "cg2100p.h"
 
-PAGE "Nuova partita" -1 -1 40 7
+PAGE "Nuova partita" -1 -1 40 10
 
 RADIOBUTTON P_NUOVO 1 23
 BEGIN
@@ -14,7 +14,7 @@ END
 
 NUMBER P_ANNO 4
 BEGIN
-  PROMPT 24 1 "Anno   "
+  PROMPT 24 0 "Anno   "
 //  FLAGS "A"     
   CHECKTYPE REQUIRED
   WARNING "Inserire l'anno di riferimento partita"
@@ -22,7 +22,7 @@ END
 
 STRING P_NUMERO 7
 BEGIN
-  PROMPT 24 2 "Numero "
+  PROMPT 24 1 "Numero "
   FLAGS "U#"
   CHECKTYPE REQUIRED
   WARNING "Inserire  il numero di riferimento partita"
@@ -30,12 +30,12 @@ END
 
 BUTTON DLG_CANCEL 10 2
 BEGIN
-  PROMPT 26 3 ""
+  PROMPT 26 2 ""
 END
 
 BUTTON DLG_OK 10 2
 BEGIN
-  PROMPT 26 5 ""
+  PROMPT 26 4 ""
 END
 
 ENDPAGE
diff --git a/cg/cg2105.cpp b/cg/cg2105.cpp
index d0637891f..e516ca0a6 100755
--- a/cg/cg2105.cpp
+++ b/cg/cg2105.cpp
@@ -142,8 +142,9 @@ void TPay_mask::init(const TGame_mask* parent, int mod)
                                                                       
   set_handler(E_DESCR, descr_handler);
   set_handler(S_DESCAGG, descr_handler);
-                                                                      
-  const char a = TPartita::allineamento_richiesto(parent->conto().tipo());
+      
+  const char tipocf = parent ? parent->conto().tipo() : 'C';
+  const char a = TPartita::allineamento_richiesto(tipocf);
   field(E_NUMRIF).set_justify(a == 'R');
 
   disable(E_ANNORIF);