diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandgamemode.java
index 52a2a2215..b5c6d05d7 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandgamemode.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandgamemode.java
@@ -55,7 +55,7 @@ public class Commandgamemode extends EssentialsLoopCommand {
         }
 
         if (isProhibitedChange(user, gameMode)) {
-            user.sendTl("cantGamemode", gameMode.name());
+            user.sendTl("cantGamemode", user.playerTl(gameMode.toString().toLowerCase(Locale.ENGLISH)));
             return;
         }
 
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java
index 28d5870dd..690348a98 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java
@@ -51,6 +51,11 @@ public class Commandhelpop extends EssentialsCommand {
         final HelpopMessageSendEvent sendEvent = new HelpopMessageSendEvent(from, recipients, message);
         ess.getServer().getPluginManager().callEvent(sendEvent);
 
+        final IUser sender = (IUser) from;
+        if(!recipients.contains(sender)){
+            from.sendTl("helpOp", from.getDisplayName(), message);
+        }
+
         for (IUser recipient : sendEvent.getRecipients()) {
             recipient.sendTl("helpOp", from.getDisplayName(), message);
         }