diff --git a/MobArena.jar b/MobArena.jar
index 68bbbfb..2e26df0 100644
Binary files a/MobArena.jar and b/MobArena.jar differ
diff --git a/src/com/garbagemule/MobArena/ArenaListener.java b/src/com/garbagemule/MobArena/ArenaListener.java
index 6c71c2c..33f2ba8 100644
--- a/src/com/garbagemule/MobArena/ArenaListener.java
+++ b/src/com/garbagemule/MobArena/ArenaListener.java
@@ -792,9 +792,13 @@ public class ArenaListener
         ArenaClass oldAC = arena.getArenaPlayer(p).getArenaClass();
         ArenaClass newAC = arena.getClasses().get(className);
         
-        // If they picked the same sign, don't do anything
-        if (oldAC.equals(newAC)) {
-            return;
+        // If they already had a class, make sure to change the "in use" in the Class Limit Manager
+        if (oldAC != null) {
+            // If they picked the same sign, don't do anything
+            if (oldAC.equals(newAC)) {
+                return;
+            }
+            classLimits.playerChangedClass(oldAC);
         }
         
         // If they can not join the class, deny them
@@ -803,11 +807,6 @@ public class ArenaListener
             return;
         }
         
-        // If they already had a class, make sure to change the "in use" in the Class Limit Manager
-        if (oldAC != null) {
-            classLimits.playerChangedClass(oldAC);
-        }
-        
         // Increment the "in use" in the Class Limit Manager
         classLimits.playerPickedClass(newAC);