diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index dd42512f64612c5344a81bc20b386d57763b3820..f4200b264b1d9ff5f631829d13cd62a1b007b992 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1166,6 +1166,9 @@ window.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDemandRef
 				}
 			}
 		}
+
+		// The Madam adding to 'brothel'
+		SJVBrothel(V.slaves[V.slaveIndices[V.Madam.ID]]);
 	}
 
 
@@ -1550,14 +1553,7 @@ window.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDemandRef
 		}
 
 		// The amount of sexual acts
-		s.sexAmount = Beauty(s);
-
-		if (s.assignment === "be the Madam") {
-			if ((BL + toTheBrothelTotal > 0) && (CL + toTheBrothelTotal < 10)) {
-				s.sexAmount *= ((10 - CL - toTheBrothelTotal) / 10) * 1.5;
-			}
-		}
-		s.sexAmount = Math.trunc(s.sexAmount * beautyMultiplier * (1 + (0.002 * s.skill.whoring)));
+		s.sexAmount = Math.trunc(Beauty(s) * beautyMultiplier * (1 + (0.002 * s.skill.whoring)));
 
 		// The quality/value of each sexual act
 		s.sexQuality = FResult(s);
@@ -1641,6 +1637,13 @@ window.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDemandRef
 			s.whoreClass = 0;
 		}
 		whoreScore(s, lowerClassSexDemandRef, middleClassSexDemandRef, upperClassSexDemandRef, topClassSexDemandRef);
+
+		if (s.assignment === "be the Madam") {
+			if ((BL + toTheBrothelTotal > 0) && (BL + toTheBrothelTotal < 10)) {
+				s.sexAmount = Math.trunc(s.sexAmount * ((10 - BL - toTheBrothelTotal) / 10));
+				s.sexQuality = Math.trunc(s.sexQuality * 1.2);
+			}
+		}
 	}
 
 	return slaveJobValues;