diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 5ef47a335..f5c701cc2 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -183,6 +183,10 @@ public class MessageGenerator extends AbstractGenerator {
 		packet.setFrom(conversation.getAccount().getJid());
 		Element x = packet.addChild("x", "jabber:x:conference");
 		x.setAttribute("jid", conversation.getJid().toBareJid().toString());
+		String password = conversation.getMucOptions().getPassword();
+		if (password != null) {
+			x.setAttribute("password",password);
+		}
 		return packet;
 	}