diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e
index 7ef5bd1a..1dcb968a 100644
--- a/library/server/wsf_html/webcontrol/wsf_button_control.e
+++ b/library/server/wsf_html/webcontrol/wsf_button_control.e
@@ -59,7 +59,7 @@ feature
 
 	render: STRING
 		do
-			Result := "<button data-name=%"" + control_name + "%" data-type=%"WSF_BUTTON_CONTROL%">" + text + "</button>"
+			Result := "<button data-name=%"" + control_name + "%" data-type=%"WSF_BUTTON_CONTROL%">" + generator + text + "</button>"
 		end
 
 	set_text (t: STRING)
diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e
index a8796679..0ae82d73 100644
--- a/library/server/wsf_html/webcontrol/wsf_control.e
+++ b/library/server/wsf_html/webcontrol/wsf_control.e
@@ -11,11 +11,17 @@ feature
 
 	control_name: STRING
 
+	tag_name: STRING
+
+	css_class: LINKED_LIST[STRING]
+
 feature {NONE}
 
-	make (n: STRING)
+	make (n,a_tag_name: STRING)
 		do
 			control_name := n
+			tag_name := a_tag_name
+			create css_class.make
 			create state_changes.make
 		ensure
 			attached state_changes