diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index c6a387122..2e36c5450 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -264,6 +264,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 	protected void saveAsBookmark() {
 		Account account = mConversation.getAccount();
 		Bookmark bookmark = new Bookmark(account, mConversation.getContactJid().toBareJid());
+		if (!mConversation.getContactJid().isBareJid()) {
+			bookmark.setNick(mConversation.getContactJid().getResourcepart());
+		}
+		bookmark.setAutojoin(true);
 		account.getBookmarks().add(bookmark);
 		xmppConnectionService.pushBookmarks(account);
 		mConversation.setBookmark(bookmark);