diff --git a/src/Discord.Net/Models/Channel.cs b/src/Discord.Net/Models/Channel.cs
index eeb32d5c7..b53231344 100644
--- a/src/Discord.Net/Models/Channel.cs
+++ b/src/Discord.Net/Models/Channel.cs
@@ -120,11 +120,11 @@ namespace Discord
 				x => x.AddChannel(this), 
 				x => x.RemoveChannel(this));
 			_recipient = new Reference<User>(recipientId, 
-				x => _client.Users.GetOrAdd(x, _server.Id), 
+				x => _client.Users.GetOrAdd(x, _server.Id),
 				x =>
 				{
-					Name = "@" + x.Name;
-					if (_server.Id == null)
+                    Name = $"@{x}";
+                    if (_server.Id == null)
 						x.Global.PrivateChannel = this;
 				},
 				x =>
diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs
index 3790b516a..b98520013 100644
--- a/src/Discord.Net/Models/User.cs
+++ b/src/Discord.Net/Models/User.cs
@@ -281,6 +281,6 @@ namespace Discord
 
 		public override bool Equals(object obj) => obj is User && (obj as User).Id == Id;
 		public override int GetHashCode() => unchecked(Id.GetHashCode() + 7230);
-		public override string ToString() => Name ?? IdConvert.ToString(Id);
+		public override string ToString() => Name != null ? $"{Name}#{Discriminator}" : IdConvert.ToString(Id);
 	}
 }
\ No newline at end of file