diff --git a/src/client/autoVersion.js b/src/client/autoVersion.js
index 061e52b..23293cb 100644
--- a/src/client/autoVersion.js
+++ b/src/client/autoVersion.js
@@ -53,6 +53,7 @@ module.exports = function(client, options) {
 
     // Finished configuring client object, let connection proceed
     client.emit('connect_allowed');
+    client.wait_connect = false;
   });
   return client;
 };
diff --git a/src/createClient.js b/src/createClient.js
index faaf635..934afc3 100644
--- a/src/createClient.js
+++ b/src/createClient.js
@@ -19,6 +19,8 @@ module.exports=createClient;
 function createClient(options) {
   assert.ok(options, "options is required");
   assert.ok(options.username, "username is required");
+  if(!options.version)
+    options.version=false;
 
   // TODO: avoid setting default version if autoVersion is enabled
   const optVersion = options.version || require("./version").defaultVersion;