diff --git a/docs/notework.txt b/docs/notework.txt
index 7d696a3..8c69c6b 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -12,7 +12,9 @@ ______________________________________________________________________
                  Notes for GoldED+ 1.1.5, March xx 2001
 ______________________________________________________________________
 
-- Soft-deleted messages now not hided from messagelist right after
+- Fixed users.bbs handling for *.msg and Squish areas.
+
+- Soft-deleted messages no longer hidden from messagelist right after
   deletion any more.
 
 + Added new switch JamSMAPIHighwater. If defined GoldED+ will handle
diff --git a/goldlib/gmb3/gmofido1.cpp b/goldlib/gmb3/gmofido1.cpp
index 25ad6ea..6383566 100644
--- a/goldlib/gmb3/gmofido1.cpp
+++ b/goldlib/gmb3/gmofido1.cpp
@@ -138,8 +138,7 @@ void FidoInit(const char* fidolastread, int fidohwmarks, int fidonullfix, int fi
   const char* _username = WideUsername[0];
   if(fidowide->userno == -1) {
     Path userfile;
-    strxcpy(userfile, fidowide->squishuserpath, sizeof(Path));
-    AddPath(userfile, "USER.BBS");
+    strxcpy(userfile, AddPath(fidowide->squishuserpath, "USER.BBS"), sizeof(Path));
     fidowide->user->fh = ::sopen(userfile, O_RDWR|O_CREAT|O_BINARY, WideSharemode, S_STDRW);
     if(fidowide->user->fh != -1) {
       fidowide->user->find(_username);
diff --git a/goldlib/gmb3/gmofido5.cpp b/goldlib/gmb3/gmofido5.cpp
index 6eecdba..c4ad2ff 100644
--- a/goldlib/gmb3/gmofido5.cpp
+++ b/goldlib/gmb3/gmofido5.cpp
@@ -36,8 +36,7 @@
 char* FidoArea::user_lookup(char* __lookfor) {
 
   Path userfile;
-  strxcpy(userfile, fidowide->squishuserpath, sizeof(Path));
-  AddPath(userfile, "USER.BBS");
+  strxcpy(userfile, AddPath(fidowide->squishuserpath, "USER.BBS"), sizeof(Path));
   wide->user->fh = ::sopen(userfile, O_RDONLY|O_BINARY, WideSharemode, S_STDRD);
   wide->user->findwild(__lookfor, __lookfor);
   ::close(wide->user->fh);
diff --git a/goldlib/gmb3/gmosqsh1.cpp b/goldlib/gmb3/gmosqsh1.cpp
index 331992f..6dc697b 100644
--- a/goldlib/gmb3/gmosqsh1.cpp
+++ b/goldlib/gmb3/gmosqsh1.cpp
@@ -87,8 +87,7 @@ void SquishInit(const char* userpath, int userno, int direct, int recycle, int s
   throw_new(squishwide->user);
 
   Path userfile;
-  strxcpy(userfile, userpath, sizeof(Path));
-  AddPath(userfile, "USER.BBS");
+  strxcpy(userfile, AddPath(userpath, "USER.BBS"), sizeof(Path));
   const char* _username = WideUsername[0];
   if(squishwide->userno == -1) {
     squishwide->user->fh = ::sopen(userfile, O_RDWR|O_CREAT|O_BINARY, WideSharemode, S_STDRW);
diff --git a/goldlib/gmb3/gmosqsh5.cpp b/goldlib/gmb3/gmosqsh5.cpp
index 9ed6b08..4b9f892 100644
--- a/goldlib/gmb3/gmosqsh5.cpp
+++ b/goldlib/gmb3/gmosqsh5.cpp
@@ -36,8 +36,7 @@
 char* SquishArea::user_lookup(char* __lookfor) {
 
   Path userfile;
-  strxcpy(userfile, wide->userpath, sizeof(Path));
-  AddPath(userfile, "USER.BBS");
+  strxcpy(userfile, AddPath(wide->userpath, "USER.BBS"), sizeof(Path));
   wide->user->fh = ::sopen(userfile, O_RDONLY|O_BINARY, WideSharemode, S_STDRD);
   wide->user->findwild(__lookfor, __lookfor);
   ::close(wide->user->fh);