diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js
index 7e2aa6b95..4bb62f9bb 100644
--- a/lib/Client/Resolver/Resolver.js
+++ b/lib/Client/Resolver/Resolver.js
@@ -286,7 +286,12 @@ var Resolver = (function () {
 			return Promise.resolve(resource.defaultChannel);
 		}
 		if (resource instanceof String || typeof resource === "string") {
-			return Promise.resolve(this.internal.channels.get("id", resource) || this.internal.private_channels.get("id", resource));
+			var user = this.internal.users.get("id", resource);
+			if (user) {
+				resource = user;
+			} else {
+				return Promise.resolve(this.internal.channels.get("id", resource) || this.internal.private_channels.get("id", resource));
+			}
 		}
 		if (resource instanceof _StructuresUser2["default"]) {
 			// see if a PM exists
diff --git a/src/Client/Resolver/Resolver.js b/src/Client/Resolver/Resolver.js
index 0393ff269..1fe6ad759 100644
--- a/src/Client/Resolver/Resolver.js
+++ b/src/Client/Resolver/Resolver.js
@@ -216,7 +216,12 @@ export default class Resolver {
 			return Promise.resolve(resource.defaultChannel);
 		}
 		if (resource instanceof String || typeof resource === "string") {
-			return Promise.resolve(this.internal.channels.get("id", resource) || this.internal.private_channels.get("id", resource));
+			var user = this.internal.users.get("id", resource);
+			if (user) {
+				resource = user;
+			} else {
+				return Promise.resolve(this.internal.channels.get("id", resource) || this.internal.private_channels.get("id", resource));
+			}
 		}
 		if (resource instanceof User) {
 			// see if a PM exists