diff --git a/documentation/extensions/muc.md b/documentation/extensions/muc.md
index 207fcd83d..211d117c3 100644
--- a/documentation/extensions/muc.md
+++ b/documentation/extensions/muc.md
@@ -27,7 +27,7 @@ EntityBareJid mucJid = JidCreate.bareFrom("myroom@conference.jabber.org");
 Resourcepart nickname = Resourcepart.from("testbot");
 
 // A other use (we may invite him to a MUC).
-FullJid otherJid = JidCreate.fullFromm("user3@host.org/Smack");
+FullJid otherJid = JidCreate.fullFrom("user3@host.org/Smack");
 ```
 
 Create a new Room
diff --git a/resources/releasedocs/changelog.html b/resources/releasedocs/changelog.html
index 9e95e8297..91fecaa6d 100644
--- a/resources/releasedocs/changelog.html
+++ b/resources/releasedocs/changelog.html
@@ -143,6 +143,23 @@ hr {
 
 
 
+<h2>4.2.3 -- <span style="font-weight: normal;">2018-02-07</span></h2>
+                    
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-788'>SMACK-788</a>] -         NullPointerException if hostAddresses is null
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-789'>SMACK-789</a>] -         AffiliationsExtension toXml() produces invalid XML
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-790'>SMACK-790</a>] -         Some HTTP File Upload elements are not correctly parsed and serialized
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-791'>SMACK-791</a>] -         NumberFormatException in IpAddressUtil.isIPv4LiteralAddress
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/SMACK-796'>SMACK-796</a>] -         SOCKS5 authentication erroneously uses &#39;user&#39; when it should use &#39;passwd&#39;, causes authentication to fail
+</li>
+</ul>
+
 <h2>4.2.2 -- <span style="font-weight: normal;">2017-11-25</span></h2>
                     
 <h2>        Bug
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java
index 053c1a67e..33c887ea2 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java
@@ -137,7 +137,7 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
                     System.arraycopy(userBytes, 0, buf, index, 
                         user.length());
                     index += user.length();
-                    byte[] passwordBytes = user.getBytes(StringUtils.UTF8);
+                    byte[] passwordBytes = passwd.getBytes(StringUtils.UTF8);
                     buf[index++] = (byte) (passwordBytes.length);
                     System.arraycopy(passwordBytes, 0, buf, index, 
                         passwd.length());
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
index 85053a7c7..a84eb23a6 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
@@ -81,7 +81,7 @@ public class OccupantsInfo extends IQ {
 
     @Override
     protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder buf) {
-        buf.append("\" roomID=\"").append(roomID).append("\">");
+        buf.append(" roomID=\"").append(roomID).append("\">");
         synchronized (occupants) {
             for (OccupantInfo occupant : occupants) {
                 buf.append("<occupant>");
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
index 3cf62029d..e48a7610d 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
@@ -115,7 +115,7 @@ public class RoomInvitation implements ExtensionElement {
     }
 
     public IQ.IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder buf) {
-        buf.append("\" type=\"").append(type.name()).append("\">");
+        buf.append(" type=\"").append(type.name()).append("\">");
         buf.append("<session xmlns=\"http://jivesoftware.com/protocol/workgroup\" id=\"").append(sessionID).append("\"></session>");
         if (invitee != null) {
             buf.append("<invitee>").append(invitee).append("</invitee>");
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
index 2ad53cc8b..70fda6ad2 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
@@ -115,7 +115,7 @@ public class RoomTransfer implements ExtensionElement {
     }
 
     public IQ.IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder buf) {
-        buf.append("\" type=\"").append(type.name()).append("\">");
+        buf.append(" type=\"").append(type.name()).append("\">");
         buf.append("<session xmlns=\"http://jivesoftware.com/protocol/workgroup\" id=\"").append(sessionID).append("\"></session>");
         if (invitee != null) {
             buf.append("<invitee>").append(invitee).append("</invitee>");