Index: ps/trunk/source/network/NetMessages.h
===================================================================
--- ps/trunk/source/network/NetMessages.h
+++ ps/trunk/source/network/NetMessages.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -121,6 +121,7 @@
 
 START_NMT_CLASS_(Authenticate, NMT_AUTHENTICATE)
 	NMT_FIELD(CStrW, m_Name)
+	// TODO: The password should not be printed to logfiles
 	NMT_FIELD(CStrW, m_Password)
 	NMT_FIELD_INT(m_IsLocalClient, u8, 1)
 END_NMT_CLASS()
Index: ps/trunk/source/ps/ConfigDB.cpp
===================================================================
--- ps/trunk/source/ps/ConfigDB.cpp
+++ ps/trunk/source/ps/ConfigDB.cpp
@@ -33,6 +33,12 @@
 
 static pthread_mutex_t cfgdb_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+// These entries will not be printed to logfiles
+static const std::set<CStr> g_UnloggedEntries = {
+	"lobby.password",
+	"lobby.buddies"
+};
+
 CConfigDB::CConfigDB()
 {
 	// Recursive mutex needed for WriteFile
@@ -368,7 +374,7 @@
 		{
 			CStr key(header + name);
 			newMap[key] = values;
-			if (key == "lobby.password")
+			if (g_UnloggedEntries.find(key) != g_UnloggedEntries.end())
 				LOGMESSAGE("Loaded config string \"%s\"", key);
 			else
 			{