diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index b60c37a0a..c3b3ee259 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -384,25 +384,25 @@ public class EssentialsPlayerListener implements Listener {
                     }
                 }
             }
-        } else {
-            boolean broadcast = true; // whether to broadcast the updated activity
-            boolean update = true; // Only modified when the command is afk
+        }
+        
+        boolean broadcast = true; // whether to broadcast the updated activity
+        boolean update = true; // Only modified when the command is afk
 
-            PluginCommand pluginCommand = ess.getServer().getPluginCommand(cmd);
-            if (pluginCommand != null) {
-                // Switch case for commands that shouldn't broadcast afk activity.
-                switch (pluginCommand.getName()) {
-                    case "afk":
-                        update = false;
-                    case "vanish":
-                        broadcast = false;
-                }
-            }
-            if (update) {
-                final User user = ess.getUser(player);
-                user.updateActivity(broadcast);
+        PluginCommand pluginCommand = ess.getServer().getPluginCommand(cmd);
+        if (pluginCommand != null) {
+            // Switch case for commands that shouldn't broadcast afk activity.
+            switch (pluginCommand.getName()) {
+                case "afk":
+                    update = false;
+                case "vanish":
+                    broadcast = false;
             }
         }
+        if (update) {
+            final User user = ess.getUser(player);
+            user.updateActivity(broadcast);
+        }
     }
 
     @EventHandler(priority = EventPriority.NORMAL)