diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/combat/CombatRegenerationService.java b/src/main/java/com/projectswg/holocore/services/gameplay/combat/CombatRegenerationService.java
index c80458973..06cf0dc1a 100644
--- a/src/main/java/com/projectswg/holocore/services/gameplay/combat/CombatRegenerationService.java
+++ b/src/main/java/com/projectswg/holocore/services/gameplay/combat/CombatRegenerationService.java
@@ -61,20 +61,33 @@ public class CombatRegenerationService extends Service {
 	private void regenerate(CreatureObject creature) {
 		regenerationHealthTick(creature);
 		regenerationActionTick(creature);
+		regenerationMindTick(creature);
 	}
 	
 	private void regenerationActionTick(CreatureObject creature) {
 		if (creature.getAction() >= creature.getMaxAction())
 			return;
 		
-		int modification = creature.getMaxAction() / 10;
+		int modification = creature.getMaxAction() / 40;
 		
 		if (!creature.isInCombat())
-			modification *= 4;
+			modification *= 2;
 		
 		creature.modifyAction(modification);
 	}
 	
+	private void regenerationMindTick(CreatureObject creature) {
+		if (creature.getMind() >= creature.getMaxMind())
+			return;
+		
+		int modification = creature.getMaxMind() / 40;
+		
+		if (!creature.isInCombat())
+			modification *= 2;
+		
+		creature.modifyMind(modification);
+	}
+	
 	private void regenerationHealthTick(CreatureObject creature) {
 		if (creature.getHealth() >= creature.getMaxHealth() || creature.isInCombat())
 			return;
@@ -86,10 +99,7 @@ public class CombatRegenerationService extends Service {
 				break;
 		}
 		
-		int modification = creature.getMaxHealth() / 10;
-		
-		if (!creature.isInCombat())
-			modification *= 4;
+		int modification = creature.getMaxHealth() / 40;
 		
 		creature.modifyHealth(modification);
 	}