diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index 71b5e8176d2..3e5d25059e6 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -1,6 +1,5 @@
 {{#if showSelector}}
   {{user-selector topicId=topicId
-                  excludeCurrentUser='true'
                   onChangeCallback='triggerResize'
                   id="private-message-users"
                   includeMentionableGroups='true'
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 28235ed8024..c09e11ba902 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -267,8 +267,6 @@ class Guardian
     (target.is_a?(Group) || target.is_a?(User)) &&
     # User is authenticated
     authenticated? &&
-    # Can't send message to yourself
-    is_not_me?(target) &&
     # Have to be a basic level at least
     @user.has_trust_level?(SiteSetting.min_trust_to_send_messages) &&
     # PMs are enabled
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 35f9108eb77..28ba8468b80 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -144,8 +144,9 @@ describe Guardian do
       expect(Guardian.new(user).can_send_private_message?(nil)).to be_falsey
     end
 
-    it "returns false when the target is the same as the user" do
-      expect(Guardian.new(user).can_send_private_message?(user)).to be_falsey
+    it "returns true when the target is the same as the user" do
+      # this is now allowed so yay
+      expect(Guardian.new(user).can_send_private_message?(user)).to be_truthy
     end
 
     it "returns false when you are untrusted" do