diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
index c1fb775d7b4..efd64c56b02 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -1174,6 +1174,10 @@ public void onInventoryCloseEvent(final InventoryCloseEvent event) {
 
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onPlayerFishEvent(final PlayerFishEvent event) {
+        if (!ess.getSettings().cancelAfkOnFish()) {
+            return;
+        }
+
         final User user = ess.getUser(event.getPlayer());
         user.updateActivityOnInteract(true);
     }
diff --git a/Essentials/src/main/java/com/earth2me/essentials/ISettings.java b/Essentials/src/main/java/com/earth2me/essentials/ISettings.java
index 0ba2d7d9c14..857dd0ce226 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/ISettings.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/ISettings.java
@@ -221,6 +221,8 @@ public interface ISettings extends IConf {
 
     boolean cancelAfkOnChat();
 
+    boolean cancelAfkOnFish();
+
     boolean sleepIgnoresAfkPlayers();
 
     boolean sleepIgnoresVanishedPlayers();
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Settings.java b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
index 8d41da405e7..136a448ba5d 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
@@ -1320,6 +1320,11 @@ public boolean cancelAfkOnChat() {
         return config.getBoolean("cancel-afk-on-chat", true);
     }
 
+    @Override
+    public boolean cancelAfkOnFish() {
+        return config.getBoolean("cancel-afk-on-fish", true);
+    }
+
     @Override
     public boolean sleepIgnoresAfkPlayers() {
         return sleepIgnoresAfkPlayers;
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpoffline.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpoffline.java
index 5448aa7cfeb..cc4f31c0e32 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpoffline.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpoffline.java
@@ -21,7 +21,7 @@ public void run(final Server server, final User user, final String label, final
             final Location logout = target.getLogoutLocation();
 
             if (logout == null) {
-                user.sendTl("teleportOfflineUnknown", user.getDisplayName());
+                user.sendTl("teleportOfflineUnknown", target.getDisplayName());
                 throw new NoChargeException();
             }
 
diff --git a/Essentials/src/main/resources/config.yml b/Essentials/src/main/resources/config.yml
index 5c87444d9fb..25bbf68d716 100644
--- a/Essentials/src/main/resources/config.yml
+++ b/Essentials/src/main/resources/config.yml
@@ -491,7 +491,7 @@ auto-afk: 300
 auto-afk-timeout: -1
 
 # A list of commands to be executed instead of kicking the player once the
-# threshold defined above in 'afk-auto-timeout' is reached. If this list is empty 
+# threshold defined above in 'afk-auto-timeout' is reached. If this list is empty
 # and 'afk-auto-timeout' is not set to -1, Essentials will default to
 # kicking the player once they reach the timeout threshold.
 #
@@ -527,6 +527,9 @@ cancel-afk-on-move: true
 # Should Essentials automatically remove AFK status when a player sends a chat message?
 cancel-afk-on-chat: true
 
+# Should Essentials automatically remove AFK status when a player uses a fishing rod?
+cancel-afk-on-fish: true
+
 # Should AFK players be ignored when other players are trying to sleep?
 # When this setting is false, players won't be able to skip the night if some players are AFK.
 # Players with the permission 'essentials.sleepingignored' will always be ignored.
@@ -897,8 +900,8 @@ baltop-requirements:
   minimum-balance: 0
   minimum-playtime: 0
 
-# Limit the number of cached balance top entries. 
-# Recommended for servers with a large number of players, as it reduces memory usage. 
+# Limit the number of cached balance top entries.
+# Recommended for servers with a large number of players, as it reduces memory usage.
 # Set to -1 to disable the limit.
 baltop-entry-limit: -1