Index: branches/5.1.x/elements/captcha_image.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/elements/captcha_image.elm.tpl	(revision 0)
+++ branches/5.1.x/elements/captcha_image.elm.tpl	(revision 13388)
@@ -0,0 +1 @@
+<inp2:m_CaptchaImage/>
\ No newline at end of file
Index: branches/5.1.x/designs/form.tpl
===================================================================
diff -u -N -r13087 -r13388
--- branches/5.1.x/designs/form.tpl	(.../form.tpl)	(revision 13087)
+++ branches/5.1.x/designs/form.tpl	(.../form.tpl)	(revision 13388)
@@ -40,6 +40,10 @@
 
 							<inp2:formflds_PrintList render_as="form_field" SourcePrefix="formsubs" per_page="-1"/>
 
+							<inp2:m_if check="form_Field" name="UseSecurityImage" db="db">
+								<inp2:m_RenderElement name="inp_edit_captcha" prefix="formsubs"/>
+							</inp2:m_if>
+
 							<p class="button">
 								<input type="reset" name="reset" value="<inp2:m_Phrase label='lu_btn_Reset' no_editing='1'/>" />
 								<input type="submit" name="events[formsubs][OnCreate]" value="<inp2:m_Phrase label='lu_btn_Send' no_editing='1'/>" class="submit"/>
Index: branches/5.1.x/elements/dynamic_forms.elm.tpl
===================================================================
diff -u -N -r13087 -r13388
--- branches/5.1.x/elements/dynamic_forms.elm.tpl	(.../dynamic_forms.elm.tpl)	(revision 13087)
+++ branches/5.1.x/elements/dynamic_forms.elm.tpl	(.../dynamic_forms.elm.tpl)	(revision 13388)
@@ -62,4 +62,17 @@
 ##-->
 	<inp2:ConfigFormElement field="Value" blocks_prefix="form_field_" element_type_field="ElementType" value_list_field="ValueList" />
 </p>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_captcha" style="" title="lu_fld_Captcha" no_editing="1" is_last="0">
+	<p>
+		<label for="<inp2:{$prefix}_InputName field='Captcha'/>" <inp2:m_if check="{$prefix}_HasError" field="Captcha">class="red"</inp2:m_if>>
+			<inp2:m_phrase label="$title"/>&nbsp;<inp2:m_if check="{$prefix}_IsRequired" field="Captcha"><span class="red">*</span></inp2:m_if>
+		</label>
+
+		<em>
+			<img src="<inp2:m_Link template="elements/captcha_image.elm" var="{$prefix}_captcha_code" w="150" h="30"/>" alt="<inp2:m_Phrase name="$title" no_editing="1"/>"/><br />
+			<input type="text" class="field" name="<inp2:{$prefix}_InputName field="Captcha"/>" value="<inp2:{$prefix}_Field field="Captcha"/>">
+		</em>
+	</p>
 </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/5.1.x/_install/install_data.sql
===================================================================
diff -u -N -r13087 -r13388
--- branches/5.1.x/_install/install_data.sql	(.../install_data.sql)	(revision 13087)
+++ branches/5.1.x/_install/install_data.sql	(.../install_data.sql)	(revision 13388)
@@ -22,14 +22,14 @@
 INSERT INTO PermCache VALUES(DEFAULT, 202, 1, '11');
 INSERT INTO PermCache VALUES(DEFAULT, 203, 1, '11');
 
-INSERT INTO Forms VALUES(1, 'Contact Us', 'Form for contacts');
+INSERT INTO Forms VALUES(1, 'Contact Us', 'Form for contacts', 0, 0, 0, '', '', '', '', '', '', '110', '', '', '', '', '110', '', '');
 
-INSERT INTO FormFields VALUES(1, 1, 0, 'Name', 'lu_fld_Name', NULL, 'la_fld_Name', 'text', NULL, 5, 0, 1, 1, NULL, 0);
-INSERT INTO FormFields VALUES(2, 1, 0, 'Company', 'lu_fld_Company', NULL, 'la_fld_Company', 'text', NULL, 4, 0, 1, 1, NULL, 0);
-INSERT INTO FormFields VALUES(3, 1, 0, 'Email', 'lu_fld_Email', NULL, 'la_fld_Email', 'text', NULL, 3, 0, 1, 1, NULL, 1);
-INSERT INTO FormFields VALUES(4, 1, 0, 'Phone', 'lu_fld_Phone', NULL, 'la_fld_Phone', 'text', NULL, 2, 0, 0, 1, NULL, 0);
-INSERT INTO FormFields VALUES(5, 1, 0, 'Message', 'lu_fld_Message', NULL, 'la_fld_Message', 'textarea', NULL, 0, 0, 1, 0, NULL, 0);
-INSERT INTO FormFields VALUES(6, 1, 0, 'Subject', 'lu_fld_Subject', NULL, 'la_fld_Subject', 'select', '=+-- Please select --||0=+Sales questions||1=+General questions||2=+Billing questions||3=+Support questions', 1, 0, 1, 0, NULL, 0);
+INSERT INTO FormFields VALUES(1, 1, 0, 'Name', 'lu_fld_Name', NULL, 'la_fld_Name', 'text', NULL, 5, 0, 1, 1, NULL, 0, 1, 0);
+INSERT INTO FormFields VALUES(2, 1, 0, 'Company', 'lu_fld_Company', NULL, 'la_fld_Company', 'text', NULL, 4, 0, 1, 1, NULL, 0, 1, 0);
+INSERT INTO FormFields VALUES(3, 1, 0, 'Email', 'lu_fld_Email', NULL, 'la_fld_Email', 'text', NULL, 3, 0, 1, 1, NULL, 1, 1, 0);
+INSERT INTO FormFields VALUES(4, 1, 0, 'Phone', 'lu_fld_Phone', NULL, 'la_fld_Phone', 'text', NULL, 2, 0, 0, 1, NULL, 0, 1, 0);
+INSERT INTO FormFields VALUES(5, 1, 0, 'Message', 'lu_fld_Message', NULL, 'la_fld_Message', 'textarea', NULL, 0, 0, 1, 0, NULL, 0, 1, 0);
+INSERT INTO FormFields VALUES(6, 1, 0, 'Subject', 'lu_fld_Subject', NULL, 'la_fld_Subject', 'select', '=+-- Please select --||0=+Sales questions||1=+General questions||2=+Billing questions||3=+Support questions', 1, 0, 1, 0, NULL, 0, 1, 0);
 
 ALTER TABLE FormSubmissions
 	ADD COLUMN fld_1 text,