diff --git a/src/main/java/com/salesforce/emp/connector/LoginHelper.java b/src/main/java/com/salesforce/emp/connector/LoginHelper.java
index c7b64d7..9b92d2d 100644
--- a/src/main/java/com/salesforce/emp/connector/LoginHelper.java
+++ b/src/main/java/com/salesforce/emp/connector/LoginHelper.java
@@ -39,7 +39,9 @@ private static class LoginResponseParser extends DefaultHandler {
 
         @Override
         public void characters(char[] ch, int start, int length) {
-            if (reading) buffer = new String(ch, start, length);
+            if (reading) {
+                buffer += new String(ch, start, length);
+            }
         }
 
         @Override
@@ -57,7 +59,7 @@ public void endElement(String uri, String localName, String qName) {
                 break;
             default:
             }
-            buffer = null;
+            buffer = "";
         }
 
         @Override
@@ -134,8 +136,9 @@ public static BayeuxParameters login(URL loginEndpoint, String username, String
             saxParser.parse(new ByteArrayInputStream(response.getContent()), parser);
 
             String sessionId = parser.sessionId;
-            if (sessionId == null || parser.serverUrl == null) { throw new ConnectException(
-                    String.format("Unable to login: %s", parser.faultstring)); }
+            if (sessionId == null || parser.serverUrl == null) {
+                throw new ConnectException(String.format("Unable to login: %s", parser.faultstring));
+            }
 
             URL soapEndpoint = new URL(parser.serverUrl);
             String cometdEndpoint = Float.parseFloat(parameters.version()) < 37 ? COMETD_REPLAY_OLD : COMETD_REPLAY;
@@ -163,7 +166,8 @@ private static String getSoapUri() {
     }
 
     private static byte[] soapXmlForLogin(String username, String password) throws UnsupportedEncodingException {
-        return (ENV_START + "  <urn:login>" + "    <urn:username>" + username + "</urn:username>" + "    <urn:password>"
-                + password + "</urn:password>" + "  </urn:login>" + ENV_END).getBytes("UTF-8");
+        return (ENV_START + "  <urn:login>" + "    <urn:username>" + username + "</urn:username>"
+                + "    <urn:password><![CDATA[" + password + "]]></urn:password>" + "  </urn:login>" + ENV_END)
+                        .getBytes("UTF-8");
     }
 }