diff --git a/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.html b/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.html
index bd1b5fa1ca4..01e96e339d6 100644
--- a/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.html
+++ b/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.html
@@ -1 +1 @@
-<webobject name=RadioButtonRepetition><table border=0 cellpadding=0 cellspacing=0 class="ERXMatrixTable"><tr><td><wo:if condition="$disabled"><webobject name="RadioButtonDisabled"/></wo:if><wo:else><webobject name="RadioButton"/></wo:else></td><td class="ERXMatrixTableCell"><webobject name=Content></webobject></td></tr></table></webobject>
\ No newline at end of file
+<webobject name=RadioButtonRepetition><table border=0 cellpadding=0 cellspacing=0 class="ERXMatrixTable"><tr><td><webobject name=RadioButtonIsDisabled><webobject name="RadioButtonDisabled"/></webobject><webobject name=RadioButtonIsEnabled><webobject name="RadioButton"/></webobject></td><td class="ERXMatrixTableCell"><webobject name=Content></webobject></td></tr></table></webobject>
\ No newline at end of file
diff --git a/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.wod b/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.wod
index 2d0947ed793..1d24256bd30 100644
--- a/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.wod
+++ b/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.wod
@@ -18,6 +18,15 @@ RadioButtonDisabled: WOGenericElement {
     disabled = true;
 }
 
+RadioButtonIsDisabled: WOConditional {
+	condition = disabled;
+}
+
+RadioButtonIsEnabled: WOConditional {
+	condition = disabled;
+	negate = true;
+}
+
 RadioButtonRepetition: ERXTable {
 	cellpadding = cellpadding;
 	cellspacing = cellspacing;