diff --git a/src/tcp.rs b/src/tcp.rs
index 4510a39..2f207ec 100644
--- a/src/tcp.rs
+++ b/src/tcp.rs
@@ -51,10 +51,10 @@ impl Future for TcpClient {
         };
 
         self.state = new_state;
-	match result {
-	    // by polling again, we register new future
-	    Ok(Async::NotReady) => self.poll(),
-	    result => result
-	}
+        match result {
+            // by polling again, we register new future
+            Ok(Async::NotReady) => self.poll(),
+            result => result
+        }
     }
 }
diff --git a/src/xmpp_stream.rs b/src/xmpp_stream.rs
index 2b8f098..c84777f 100644
--- a/src/xmpp_stream.rs
+++ b/src/xmpp_stream.rs
@@ -4,7 +4,7 @@ use futures::*;
 use tokio_io::{AsyncRead, AsyncWrite};
 use tokio_io::codec::Framed;
 use xml;
-use sasl::common::Credentials;
+use sasl::common::{Credentials, ChannelBinding};
 use jid::Jid;
 
 use xmpp_codec::*;
@@ -55,7 +55,8 @@ impl<S: AsyncRead + AsyncWrite> XMPPStream<S> {
     pub fn auth(self, username: String, password: String) -> Result<ClientAuth<S>, String> {
         let creds = Credentials::default()
             .with_username(username)
-            .with_password(password);
+            .with_password(password)
+            .with_channel_binding(ChannelBinding::None);
         ClientAuth::new(self, creds)
     }
 }