diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
index ba55e5d6..68f07722 100644
--- a/src/services/PlayerService.java
+++ b/src/services/PlayerService.java
@@ -566,6 +566,7 @@ public class PlayerService implements INetworkDispatch {
 		}
 		
 		grantLevel(creature, level);
+		
 		player.setProfessionIcon(Professions.get(profession));
 	}
 	
@@ -602,7 +603,11 @@ public class PlayerService implements INetworkDispatch {
 			//core.equipmentService.unequip(creature, equipment);
 		//}
 		
-		core.buffService.clearBuffs(creature);
+		for (Buff buff : creature.getBuffList()) {
+			if (buff.isRemoveOnRespec()) {
+				core.buffService.removeBuffFromCreature(creature, buff);
+			}
+		}
 		
 		try {
 			String[] skills;