diff --git a/cg/cg0100.cpp b/cg/cg0100.cpp
index f3e04e0c9..04dd06726 100755
--- a/cg/cg0100.cpp
+++ b/cg/cg0100.cpp
@@ -224,7 +224,7 @@ void TPianoconti_app::init_insert_mode(TMask& m)
       s3 = pconti.get(PCN_NUMRIVD);
       s4 = pconti.get(PCN_NUMIVD);
       if (s3.empty())
-        s3 = "    ";
+        s3.spaces(4);
       else
         s3.right_just(4,'0');
 
@@ -232,10 +232,10 @@ void TPianoconti_app::init_insert_mode(TMask& m)
         s4.right_just(2,'0');
 
       key.format("%1d%1s%s%s", s1, (const char*) s2,(const char*) s3, (const char*) s4);
-      s5 = cache().get("%IVD", key, "S0"); //
+      s5 = cache().get("%IVD", key, "S0");
       indbil = pconti.get_int(PCN_INDBIL);
     }
-    ivd_enable =  (s1 == 0) && s2.empty() && s3.empty() && s4.empty();
+    ivd_enable =  (s1 == 0) && s2.blank() && s3.blank() && s4.blank();
     m.show(FLD_CM1_IVACOMP, indbil == RICAVI);
     m.show(FLD_CM1_DESCIVACOMP, indbil == RICAVI);
   }
diff --git a/cg/cg0200.cpp b/cg/cg0200.cpp
index 241253ed1..449e37db2 100755
--- a/cg/cg0200.cpp
+++ b/cg/cg0200.cpp
@@ -451,8 +451,7 @@ void TClifo_application::init_insert_mode(TMask& m)
 void TClifo_application::init_modify_mode(TMask& m)
 {
   m.enable_page(4, _gesven);
-  if (_gesven)
-    m.efield(F_IBAN_STATO).validate(K_TAB); // Decodifica IBAN
+  m.efield(F_IBAN_STATO).validate(K_TAB); // Decodifica IBAN
 }
 
 void TClifo_application::set_pnae(TMask& m, TToken_string& nonacc, TToken_string& nonscd)