diff --git a/src/database/redis.js b/src/database/redis.js
index 09d13d6cf8..8b0a4fceac 100644
--- a/src/database/redis.js
+++ b/src/database/redis.js
@@ -93,16 +93,10 @@
 
 		if (redis_socket_or_host && redis_socket_or_host.indexOf('/') >= 0) {
 			/* If redis.host contains a path name character, use the unix dom sock connection. ie, /tmp/redis.sock */
-			cxn = redis.createClient(nconf.get('redis:host'));
+			cxn = redis.createClient(nconf.get('redis:host'), { auth_pass: nconf.get('redis:password') });
 		} else {
 			/* Else, connect over tcp/ip */
-			cxn = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host'));
-		}
-
-		if (nconf.get('redis:password')) {
-			cxn.auth(nconf.get('redis:password'));
-		} else {
-			winston.warn('You have no redis password setup!');
+			cxn = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host'), { auth_pass: nconf.get('redis:password') });
 		}
 
 		cxn.on('error', function (err) {
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 354e72516e..19de9251f0 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -82,7 +82,10 @@ Sockets.init = function(server) {
 			sub = database.connect(),
 			client = database.connect();
 
+		// "redis" property needs to be passed in as referenced here: https://github.com/Automattic/socket.io/issues/808
+		// Probably fixed in socket.IO 1.0
 		config.store = new RedisStore({
+			redis: require('redis'),
 			redisPub : pub,
 			redisSub : sub,
 			redisClient : client