diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index 04d7ab91..8b7439f9 100644
--- a/src/lib/player/login.c
+++ b/src/lib/player/login.c
@@ -356,12 +356,14 @@ play_cmd(void)
 	return RET_FAIL;
     }
     snprintf(buf, sizeof(buf), "Play#%d", player->cnum);
-    empth_set_name(empth_self(), buf);
     logerror("%s logged in as country #%d", praddr(player), player->cnum);
+    journal_login();
+    empth_set_name(empth_self(), buf);
     pr_id(player, C_INIT, "%d\n", CLIENTPROTO);
     empth_rwlock_rdlock(shutdown_lock);
     player->state = PS_PLAYING;
     player_main(player);
+    journal_logout();
     logerror("%s logged out, country #%d", praddr(player), player->cnum);
     if (!io_eof(player->iop) && !io_error(player->iop))
 	io_set_eof(player->iop);
diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 98e642ed..00059368 100644
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -37,7 +37,6 @@
 #include "empio.h"
 #include "empthread.h"
 #include "file.h"
-#include "journal.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"
@@ -84,7 +83,6 @@ player_main(struct player *p)
     strcpy(natp->nat_hostaddr, player->hostaddr);
     natp->nat_last_login = player->curup;
     putnat(natp);
-    journal_login();
     if (natp->nat_flags & NF_INFORM && natp->nat_tgms > 0) {
 	if (natp->nat_tgms == 1)
 	    pr("You have a new telegram waiting ...\n");
@@ -107,7 +105,6 @@ player_main(struct player *p)
     update_timeused(natp->nat_last_logout);
     enforce_minimum_session_time();
     pr("Bye-bye\n");
-    journal_logout();
 }
 
 static int