diff --git a/flag.go b/flag.go
index a26fee1..fcc8c22 100644
--- a/flag.go
+++ b/flag.go
@@ -51,4 +51,7 @@ func parseCliArgs() {
 	util.UserHypha = util.CanonicalName(util.UserHypha)
 	util.HeaderLinksHypha = util.CanonicalName(util.HeaderLinksHypha)
 	user.AuthUsed = util.UseFixedAuth
+	if user.AuthUsed && util.FixedCredentialsPath != "" {
+		user.ReadUsersFromFilesystem()
+	}
 }
diff --git a/user/users.go b/user/users.go
index 847d130..9a56212 100644
--- a/user/users.go
+++ b/user/users.go
@@ -66,10 +66,10 @@ func userByName(username string) *User {
 
 func commenceSession(username, token string) {
 	tokens.Store(token, username)
-	go dumpTokens()
+	dumpTokens()
 }
 
 func terminateSession(token string) {
 	tokens.Delete(token)
-	go dumpTokens()
+	dumpTokens()
 }