1 files changed, 4 insertions, 0 deletions
diff --git a/poezio/core/commands.py b/poezio/core/commands.py
index ab0ced9a..91d98030 100644
--- a/poezio/core/commands.py
+++ b/poezio/core/commands.py
@@ -406,6 +406,10 @@ class CommandCore:
                 tab.password = password
                 tab.join()
 
+        if config.get('bookmark_on_join'):
+            method = 'remote' if config.get('use_remote_bookmarks') else 'local'
+            self._add_bookmark('%s/%s' % (room, nick), True, password, method)
+
         if tab == self.core.current_tab():
             tab.refresh()
             self.core.doupdate()