diff --git a/ba/ba0.cpp b/ba/ba0.cpp
index 2b0ce9d67..28c889d2b 100755
--- a/ba/ba0.cpp
+++ b/ba/ba0.cpp
@@ -476,49 +476,32 @@ bool TMenu_application::check_user()
 {
   TMask m("ba0100a");
   TLocalisamfile users(LF_USER);
-  TString16 user;
-  TString16 password;
-  
-  for (int i = 0 ; i < 3; i++)
-  {
-    if (m.run() == K_ESC) return FALSE;
-    user = m.get(F_USER);
-    password = m.get(F_PASSWORD);
-    
-    if (password.len() > 3) 
-    {
-      users.zero();
-      users.put("USERNAME", user);
-      if (users.read() == NOERR)
-      {
-        const TString16 pwd(users.get("PASSWORD"));
+  TString16 user, pwd;
 
-        if (pwd == encode(password))
-        {
-          set_user(user);
-          return TRUE;
-        }
-        else
-          message_box("Password errata");
-      }
-      else
-        if (user == "PRASSI")
-        {
-          if (m.get(F_PASSWORD) == "pr.assi")
-          {
-            set_user(user);
-            return TRUE;
-          }
-          else 
-            message_box("Password errata");
-        }
-        else
-          message_box("Utente sconosciuto");
-    }
+  bool ok = FALSE;
+  for (int i = 0 ; i < 3 && !ok; i++)
+  {
+    if (m.run() == K_ESC)
+      break;
+    
+    user = m.get(F_USER);
+    users.zero();
+    users.put("USERNAME", user);
+    
+    pwd = "";
+    if (users.read() == NOERR)
+      pwd = decode(users.get("PASSWORD"));
     else
-      message_box("Password errata");
+      if (user == "PRASSI")
+        pwd = "pr.assi";
+    
+    ok = pwd.not_empty() && pwd == m.get(F_PASSWORD);
+    if (ok) 
+      set_user(user);
+    else
+      error_box("Utente e/o password errata:\nfare attenzione alle maiuscole");
   }
-  return FALSE;
+  return ok;
 }
 
 bool TMenu_application::create()
diff --git a/ba/ba3100.cpp b/ba/ba3100.cpp
index 1e72b0c94..2cac964ff 100755
--- a/ba/ba3100.cpp
+++ b/ba/ba3100.cpp
@@ -5,7 +5,7 @@
 
 #define REG_JOURNAL 5
 
-class BA3100_application : public Tab_application
+class TGeneric_table_app : public Tab_application
 {
   long       _oldditta;
   int        _oldanno;
@@ -20,14 +20,14 @@ public:
   
   bool exist_journal() {return _exist_journal;}
   
-  BA3100_application() {}
-  virtual ~BA3100_application() {}
+  TGeneric_table_app() {}
+  virtual ~TGeneric_table_app() {}
 };
 
-HIDDEN inline BA3100_application& app() { return (BA3100_application&) main_app();}
+HIDDEN inline TGeneric_table_app& app() { return (TGeneric_table_app&) main_app();}
 
 
-void BA3100_application::init_insert_mode(TMask& m) 
+void TGeneric_table_app::init_insert_mode(TMask& m) 
 {
   if (get_tabname() != "REG") return;
 
@@ -52,7 +52,7 @@ void BA3100_application::init_insert_mode(TMask& m)
   }
 }
 
-bool BA3100_application::protected_record(TRectype& rec) 
+bool TGeneric_table_app::protected_record(TRectype& rec) 
 { 
   bool prot = rec.get_bool(FPC);
   if (!prot)
@@ -84,7 +84,7 @@ HIDDEN bool tiporeg_handler(TMask_field& f, KEY k)
 }
 
 
-bool BA3100_application::user_create()
+bool TGeneric_table_app::user_create()
 {
   Tab_application::user_create();
   if (get_tabname() == "REG") 
@@ -94,7 +94,7 @@ bool BA3100_application::user_create()
 
 int ba3100(int argc, char* argv[])
 {
-  BA3100_application a ;
+  TGeneric_table_app a ;
   a.run(argc, argv, "Tabella");
   return 0;
 }