diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index 5a92fa606037aa24243ecff676326a8e94b4da79..2448688ae34cdd761d6f67a20d9b69895e6dcef5 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -1119,6 +1119,9 @@ class Account_modification_window:
 					self.plugin.roster.contacts[self.account]
 				self.plugin.sleeper_state[name] = \
 					self.plugin.sleeper_state[self.account]
+				for kind in ['infos', 'chats', 'gc']:
+					for jid in self.plugin.windows[name][kind]:
+						self.plugin.windows[name][kind][jid].account = name
 				del self.plugin.windows[self.account]
 				del self.plugin.queues[self.account]
 				del self.plugin.connected[self.account]