diff --git a/examples/roster_browser.py b/examples/roster_browser.py
index d699d3c..a428324 100644
--- a/examples/roster_browser.py
+++ b/examples/roster_browser.py
@@ -143,7 +143,7 @@ if __name__ == '__main__':
                         format='%(levelname)-8s %(message)s')
 
     if opts.jid is None:
-        opts.jid = input("Username: ")
+        opts.jid = raw_input("Username: ")
     if opts.password is None:
         opts.password = getpass.getpass("Password: ")
 
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 3536e8e..2e81eb3 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -134,7 +134,8 @@ class ClientXMPP(BaseXMPP):
                          connection. Defaults to True.
         """
         self.session_started_event.clear()
-        address = (self.boundjid.host, 5222)
+        if not address:
+            address = (self.boundjid.host, 5222)
 
         return XMLStream.connect(self, address[0], address[1],
                                  use_tls=use_tls, reattempt=reattempt)