diff --git a/Spigot-API-Patches/0051-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0051-Add-configuration-option-to-prevent-player-names-fro.patch
new file mode 100644
index 0000000000..1f70a28559
--- /dev/null
+++ b/Spigot-API-Patches/0051-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -0,0 +1,62 @@
+From 8ef5f6a840daf5e319219de47bbd4ef2e97ace64 Mon Sep 17 00:00:00 2001
+From: kashike <kashike@vq.lc>
+Date: Fri, 9 Jun 2017 07:24:24 -0700
+Subject: [PATCH] Add configuration option to prevent player names from being
+ suggested
+
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 4c20a1be..b7f0d5d9 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -1204,6 +1204,16 @@ public final class Bukkit {
+     public static boolean reloadCommandAliases() {
+         return server.reloadCommandAliases();
+     }
++
++    /**
++     * Checks if player names should be suggested when a command returns {@code null} as
++     * their tab completion result.
++     *
++     * @return true if player names should be suggested
++     */
++    public static boolean suggestPlayerNamesWhenNullTabCompletions() {
++        return server.suggestPlayerNamesWhenNullTabCompletions();
++    }
+     // Paper end
+ 
+     public static Server.Spigot spigot()
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 4f077b7c..3a27e3ae 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1032,4 +1032,14 @@ public interface Server extends PluginMessageRecipient {
+     void reloadPermissions(); // Paper
+ 
+     boolean reloadCommandAliases(); // Paper
++
++    // Paper start - allow preventing player name suggestions by default
++    /**
++     * Checks if player names should be suggested when a command returns {@code null} as
++     * their tab completion result.
++     *
++     * @return true if player names should be suggested
++     */
++    boolean suggestPlayerNamesWhenNullTabCompletions();
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
+index 3bfa31fc..dbbf0a42 100644
+--- a/src/main/java/org/bukkit/command/PluginCommand.java
++++ b/src/main/java/org/bukkit/command/PluginCommand.java
+@@ -145,6 +145,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
+         }
+ 
+         if (completions == null) {
++            if (!sender.getServer().suggestPlayerNamesWhenNullTabCompletions()) return com.google.common.collect.ImmutableList.of(); // Paper - allow preventing player name suggestions by default
+             return super.tabComplete(sender, alias, args);
+         }
+         return completions;
+-- 
+2.13.0
+
diff --git a/Spigot-Server-Patches/0212-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0212-Add-configuration-option-to-prevent-player-names-fro.patch
new file mode 100644
index 0000000000..09d8cb77eb
--- /dev/null
+++ b/Spigot-Server-Patches/0212-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -0,0 +1,39 @@
+From bccb89f85524a48eb9b6f4bb12f3369b7e151fe2 Mon Sep 17 00:00:00 2001
+From: kashike <kashike@vq.lc>
+Date: Fri, 9 Jun 2017 07:24:34 -0700
+Subject: [PATCH] Add configuration option to prevent player names from being
+ suggested
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+index 28917f63..f4b23703 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+@@ -265,4 +265,9 @@ public class PaperConfig {
+         }
+         removeInvalidStatistics = getBoolean("settings.remove-invalid-statistics", false);
+     }
++
++    public static boolean suggestPlayersWhenNullTabCompletions = true;
++    private static void suggestPlayersWhenNull() {
++        suggestPlayersWhenNullTabCompletions = getBoolean("settings.suggest-player-names-when-null-tab-completions", suggestPlayersWhenNullTabCompletions);
++    }
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index d515ef0f..463f5890 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1873,5 +1873,10 @@ public final class CraftServer implements Server {
+         commandMap.registerServerAliases();
+         return true;
+     }
++
++    @Override
++    public boolean suggestPlayerNamesWhenNullTabCompletions() {
++        return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
++    }
+     // Paper end
+ }
+-- 
+2.13.0
+