diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm
index 0cbc79a23a2..ef516007777 100644
--- a/code/modules/organs/subtypes/augment.dm
+++ b/code/modules/organs/subtypes/augment.dm
@@ -498,15 +498,11 @@
 	if(!owner)
 		return
 
-	if(prob(1))
-
+	if(prob(10))
 		switch(set_emotion)
-
-			if("Happiness")
-
+			if("happiness")
 				to_chat(owner, SPAN_NOTICE("You feel happy."))
-
-			if("Calmness")
+			if("calmness")
 				to_chat(owner, SPAN_NOTICE("You feel calm."))
 
 		if(is_broken())
diff --git a/html/changelogs/EmotionManipulator.yml b/html/changelogs/EmotionManipulator.yml
new file mode 100644
index 00000000000..8bf58327f42
--- /dev/null
+++ b/html/changelogs/EmotionManipulator.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "The emotional manipulator augment now properly gives the messages it should."