diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 342bb76e0..e6c1e90f9 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -878,6 +878,9 @@ class GroupchatControl(ChatControlBase):
 						os.path.join(path, puny_new_nick + ext)
 				for old_file in files:
 					if os.path.exists(old_file):
+						if os.path.exists(files[old_file]):
+							# Windows require this
+							os.remove(files[old_file])
 						os.rename(old_file, files[old_file])
 				self.print_conversation(s, 'info')