diff --git a/src/sbbs3/listfile.cpp b/src/sbbs3/listfile.cpp
index 3c4eebd72cd09309dcff4e85619eac1d5e082bbd..add5abe75f6afc218bc3342e3a63171447b23d2b 100644
--- a/src/sbbs3/listfile.cpp
+++ b/src/sbbs3/listfile.cpp
@@ -486,7 +486,7 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, ulong* row, uint total
 			return(3);
 		if(ch=='T') {
 			useron.misc ^= EXTDESC;
-			putusermisc(&cfg, useron.number, useron.misc);
+			putusermisc(useron.number, useron.misc);
 			return 2;
 		}
 		if(ch=='B' || ch=='D') {    /* Flag for batch download */
diff --git a/src/sbbs3/logon.cpp b/src/sbbs3/logon.cpp
index ececce02a0543a13dd3809205031cd6af4005037..c70052228caa5c59d4b775c348a233c510e76d59 100644
--- a/src/sbbs3/logon.cpp
+++ b/src/sbbs3/logon.cpp
@@ -296,7 +296,7 @@ bool sbbs_t::logon()
 			}
 			SAFECOPY(useron.pass,str);
 			useron.pwmod=time32(NULL);
-			putuserdatetime(&cfg, useron.number, USER_PWMOD, useron.pwmod);
+			putuserdatetime(useron.number, USER_PWMOD, useron.pwmod);
 			bputs(text[PasswordChanged]);
 			pause(); 
 		}
diff --git a/src/sbbs3/newuser.cpp b/src/sbbs3/newuser.cpp
index 99f9da76f76f24a80dc853856fa194e429c1f7a1..7acedf8a26678763521070176efbc59c449043d6 100644
--- a/src/sbbs3/newuser.cpp
+++ b/src/sbbs3/newuser.cpp
@@ -471,8 +471,8 @@ BOOL sbbs_t::newuser()
         		bprintf(text[NoFeedbackWarning],username(&cfg,cfg.node_valuser,tmp));
 				logline(LOG_NOTICE,"N!","Aborted feedback");
 				hangup();
-				putuserstr(&cfg, useron.number, USER_COMMENT, "Didn't leave feedback");
-				putusermisc(&cfg, useron.number, useron.misc | DELETED);
+				putuserstr(useron.number, USER_COMMENT, "Didn't leave feedback");
+				putusermisc(useron.number, useron.misc | DELETED);
 				putusername(&cfg,useron.number,nulstr);
 				return(FALSE); 
 			} 
diff --git a/src/sbbs3/qwk.cpp b/src/sbbs3/qwk.cpp
index 2d22810586c80ec959de08ab063e7587e4e88661..6612bb2fbd237225c07d95f9c62bce97f560acf0 100644
--- a/src/sbbs3/qwk.cpp
+++ b/src/sbbs3/qwk.cpp
@@ -507,7 +507,7 @@ void sbbs_t::qwk_sec()
 						s=uselect(0,0,0,0,0);
 						if(s>=0) {
 							SAFECOPY(useron.tmpext, ext_list[s]);
-							putuserstr(&cfg, useron.number, USER_TMPEXT, useron.tmpext);
+							putuserstr(useron.number, USER_TMPEXT, useron.tmpext);
 						}
 						strListFree(&ext_list);
 						break;
@@ -562,7 +562,7 @@ void sbbs_t::qwk_sec()
 						useron.qwk^=QWK_UTF8;
 						break;
 				}
-				putuserqwk(&cfg, useron.number, useron.qwk);
+				putuserqwk(useron.number, useron.qwk);
 			}
 			delfiles(cfg.temp_dir,ALLFILES);
 			clear_hotspots();
@@ -905,7 +905,7 @@ void sbbs_t::qwkcfgline(char *buf,uint subnum)
 	}
 
 	if(qwk!=useron.qwk)
-		putuserqwk(&cfg, useron.number, useron.qwk);
+		putuserqwk(useron.number, useron.qwk);
 }
 
 
@@ -915,7 +915,7 @@ bool sbbs_t::set_qwk_flag(ulong flag)
 		return true;
 	useron.qwk = getuserqwk(&cfg, useron.number);
 	useron.qwk|=flag;
-	return putuserqwk(&cfg, useron.number, useron.qwk) == 0;
+	return putuserqwk(useron.number, useron.qwk) == 0;
 }
 
 /****************************************************************************/
diff --git a/src/sbbs3/str.cpp b/src/sbbs3/str.cpp
index 58f7a3b2c080c70011aca66298afd6babd2930cc..ec3d7aa9e4c3834748446e07b2915b7ac3e10a59 100644
--- a/src/sbbs3/str.cpp
+++ b/src/sbbs3/str.cpp
@@ -1231,9 +1231,9 @@ void sbbs_t::change_user(void)
 		}
 	}
 	putmsgptrs();
-	putuserstr(&cfg, useron.number, USER_CURSUB
+	putuserstr(useron.number, USER_CURSUB
 		,cfg.sub[usrsub[curgrp][cursub[curgrp]]]->code);
-	putuserstr(&cfg, useron.number, USER_CURDIR
+	putuserstr(useron.number, USER_CURDIR
 		,cfg.dir[usrdir[curlib][curdir[curlib]]]->code);
 	useron.number=i;
 	getuserdat(&cfg,&useron);