Index: branches/5.0.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r12270 -r12296
--- branches/5.0.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 12270)
+++ branches/5.0.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 12296)
@@ -171,8 +171,18 @@
 		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 			<td class="control-cell">
-				<input style="<inp2:m_Param name='style'/>" type="password" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>" class="<inp2:m_param name='class'/>" />
+				<input style="<inp2:m_Param name='style'/>" type="password" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field name='{$field}_plain'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>" class="<inp2:m_param name='class'/>" />
 				<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+
+				<script type="text/javascript">
+					$(document).ready(
+						function() {
+							<inp2:m_ifnot check="{$prefix}_Field" name="{$field}_plain">
+								$('#' + jq('<inp2:{$prefix}_InputName field="$field"/>')).val('');
+							</inp2:m_ifnot>
+						}
+					);
+				</script>
 			</td>
 			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">