diff --git a/source/org/jivesoftware/smackx/packet/MUCInitialPresence.java b/source/org/jivesoftware/smackx/packet/MUCInitialPresence.java
index 2ec1da887..3c804ac00 100644
--- a/source/org/jivesoftware/smackx/packet/MUCInitialPresence.java
+++ b/source/org/jivesoftware/smackx/packet/MUCInitialPresence.java
@@ -86,7 +86,7 @@ public class MUCInitialPresence implements PacketExtension {
         buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(
             "\">");
         if (getPassword() != null) {
-            buf.append(" password=\"").append(getPassword()).append("\"");
+            buf.append("<password>").append(getPassword()).append("</password>");
         }
         if (getHistory() != null) {
             buf.append(getHistory().toXML());