diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index cd7bb0574..a7df49688 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -576,7 +576,7 @@ var InternalClient = (function () {
 			return Promise.reject(new Error("Unable to resolve resUser to a User"));
 		}
 		// start the PM
-		return this.apiRequest("post", _Constants.Endpoints.USER_CHANNELS(user.id), true, {
+		return this.apiRequest("post", _Constants.Endpoints.USER_CHANNELS(this.user.id), true, {
 			recipient_id: user.id
 		}).then(function (res) {
 			return _this13.private_channels.add(new _StructuresPMChannel2["default"](res, _this13.client));
diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js
index 4366caa4b..7e2aa6b95 100644
--- a/lib/Client/Resolver/Resolver.js
+++ b/lib/Client/Resolver/Resolver.js
@@ -290,7 +290,6 @@ var Resolver = (function () {
 		}
 		if (resource instanceof _StructuresUser2["default"]) {
 			// see if a PM exists
-			var chatFound = false;
 			for (var _iterator3 = this.internal.private_channels, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
 				var _ref3;
 
@@ -306,15 +305,10 @@ var Resolver = (function () {
 				var pmchat = _ref3;
 
 				if (pmchat.recipient.equals(resource)) {
-					chatFound = pmchat;
-					break;
+					return Promise.resolve(pmchat);
 				}
 			}
 
-			if (chatFound) {
-				// a PM already exists!
-				return Promise.resolve(chatFound);
-			}
 			// PM does not exist :\
 			return this.internal.startPM(resource);
 		}
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index 97d7355c8..4245a355c 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -433,7 +433,7 @@ export default class InternalClient {
 			return Promise.reject(new Error("Unable to resolve resUser to a User"));
 		}
 				// start the PM
-		return this.apiRequest("post", Endpoints.USER_CHANNELS(user.id), true, {
+		return this.apiRequest("post", Endpoints.USER_CHANNELS(this.user.id), true, {
 			recipient_id: user.id
 		})
 		.then(res => {
diff --git a/src/Client/Resolver/Resolver.js b/src/Client/Resolver/Resolver.js
index d07c89a24..0393ff269 100644
--- a/src/Client/Resolver/Resolver.js
+++ b/src/Client/Resolver/Resolver.js
@@ -220,18 +220,12 @@ export default class Resolver {
 		}
 		if (resource instanceof User) {
 			// see if a PM exists
-			var chatFound = false;
 			for (var pmchat of this.internal.private_channels) {
 				if (pmchat.recipient.equals(resource)) {
-					chatFound = pmchat;
-					break;
+					return Promise.resolve(pmchat);
 				}
 			}
 
-			if (chatFound) {
-				// a PM already exists!
-				return Promise.resolve(chatFound);
-			}
 			// PM does not exist :\
 			return this.internal.startPM(resource);
 		}