diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index ba522f1571..a95686f581 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -876,7 +876,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		dat += "<center><a href='?_src_=prefs;preference=trait;task=close'>Done</a></center>"
 		dat += "<hr>"
 		dat += "<center><b>Current quirks:</b> [all_quirks.len ? all_quirks.Join(", ") : "None"]</center>"
-		dat += "<center>[all_quirks.len] / [MAX_QUIRKS] max quirks<br>\
+		dat += "<center>[positive_quirks.len] / [MAX_QUIRKS] max positive quirks<br>\
 		<b>Quirk balance remaining:</b> [GetQuirkBalance()]</center><br>"
 		for(var/V in SSquirks.quirks)
 			var/datum/quirk/T = SSquirks.quirks[V]
@@ -990,9 +990,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						neutral_quirks -= quirk
 						all_quirks -= quirk
 					else
-						if(all_quirks.len >= MAX_QUIRKS)
-							to_chat(user, "<span class='warning'>You can't have more than [MAX_QUIRKS] quirks!</span>")
-							return
 						neutral_quirks += quirk
 						all_quirks += quirk
 				else
@@ -1007,8 +1004,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						negative_quirks -= quirk
 						all_quirks -= quirk
 					else if(value > 0)
-						if(all_quirks.len >= MAX_QUIRKS)
-							to_chat(user, "<span class='warning'>You can't have more than [MAX_QUIRKS] quirks!</span>")
+						if(positive_quirks.len >= MAX_QUIRKS)
+							to_chat(user, "<span class='warning'>You can't have more than [MAX_QUIRKS] positive quirks!</span>")
 							return
 						if(balance - value < 0)
 							to_chat(user, "<span class='warning'>You don't have enough balance to gain this quirk!</span>")
@@ -1016,9 +1013,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						positive_quirks += quirk
 						all_quirks += quirk
 					else
-						if(all_quirks.len >= MAX_QUIRKS)
-							to_chat(user, "<span class='warning'>You can't have more than [MAX_QUIRKS] quirks!</span>")
-							return
 						negative_quirks += quirk
 						all_quirks += quirk
 				SetQuirks(user)