diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
index b4ba60e2fef..e6f368a4776 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -270,7 +270,7 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
             final String msg = ess.getSettings().getCustomQuitMessage()
                 .replace("{PLAYER}", player.getDisplayName())
                 .replace("{USERNAME}", player.getName())
-                .replace("{ONLINE}", NumberFormat.getInstance().format(ess.getOnlinePlayers().size()))
+                .replace("{ONLINE}", NumberFormat.getInstance().format(ess.getOnlinePlayers().size() - 1)) // Subtract 1 as the leaving player is still online during this time
                 .replace("{UPTIME}", DateUtil.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime()))
                 .replace("{PREFIX}", FormatUtil.replaceFormat(ess.getPermissionsHandler().getPrefix(player)))
                 .replace("{SUFFIX}", FormatUtil.replaceFormat(ess.getPermissionsHandler().getSuffix(player)));
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpotion.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpotion.java
index 447772df318..3af22728726 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpotion.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpotion.java
@@ -34,7 +34,7 @@ protected void run(final Server server, final User user, final String commandLab
             final Set<String> potionslist = new TreeSet<>();
             for (final Map.Entry<String, PotionEffectType> entry : Potions.entrySet()) {
                 final String potionName = entry.getValue().getName().toLowerCase(Locale.ENGLISH);
-                if (potionslist.contains(potionName) || user.isAuthorized("essentials.potion." + potionName)) {
+                if (potionslist.contains(potionName) || user.isAuthorized("essentials.potions." + potionName)) {
                     potionslist.add(entry.getKey());
                 }
             }
@@ -85,7 +85,7 @@ protected List<String> getTabCompleteOptions(final Server server, final User use
             }
             for (final Map.Entry<String, PotionEffectType> entry : Potions.entrySet()) {
                 final String potionName = entry.getValue().getName().toLowerCase(Locale.ENGLISH);
-                if (user.isAuthorized("essentials.potion." + potionName)) {
+                if (user.isAuthorized("essentials.potions." + potionName)) {
                     options.add("effect:" + entry.getKey());
                 }
             }