diff --git a/ba/ba0.cpp b/ba/ba0.cpp
index 81ef52ac9..94b04f422 100755
--- a/ba/ba0.cpp
+++ b/ba/ba0.cpp
@@ -980,11 +980,16 @@ bool TMenu_application::main_loop()
             }
             if (!ok) error_box("Password di servizio errata!\nAccesso negato.");
           }
+          
           if (ok)
           {
             const TString16 module(cmd2name(option));
             if (get_firm() == 0 && module.compare("cg", 2, TRUE) == 0)   // Chiede ditta se necessario
-              set_firm();
+              ok = set_firm();
+          }
+          
+          if (ok)
+          {
             prefix().set(NULL);                      // Chiude prefix
             TFilename opt_cmd(option);
 #if XVT_OS == XVT_OS_WIN