diff --git a/admin-dev/themes/default/template/helper/form/form.tpl b/admin-dev/themes/default/template/helper/form/form.tpl
index 7f7201aa4..c41936ba9 100644
--- a/admin-dev/themes/default/template/helper/form/form.tpl
+++ b/admin-dev/themes/default/template/helper/form/form.tpl
@@ -98,7 +98,8 @@
 														{if isset($input.size)}size="{$input.size}"{/if}
 														{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
 														{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
-														{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
+														{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
+														{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
 												{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
 											</div>
 										{/foreach}
@@ -127,7 +128,8 @@
 											{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
 											{if isset($input.class)}class="{$input.class}"{/if}
 											{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
-											{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
+											{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
+											{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
 									{if isset($input.suffix)}{$input.suffix}{/if}
 									{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
 								{/if}
@@ -251,7 +253,8 @@
 								<input type="password"
 										name="{$input.name}"
 										size="{$input.size}"
-										value="" />
+										value=""
+										{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
 							{elseif $input.type == 'birthday'}
 								{foreach $input.options as $key => $select}
 									<select name="{$key}">
diff --git a/admin-dev/themes/default/template/helper/options/options.tpl b/admin-dev/themes/default/template/helper/options/options.tpl
index 3e64c9238..17ac1f97f 100644
--- a/admin-dev/themes/default/template/helper/options/options.tpl
+++ b/admin-dev/themes/default/template/helper/options/options.tpl
@@ -115,10 +115,10 @@
 					<br />
 				*}
 				{elseif $field['type'] == 'text'}
-					<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+					<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if}/>
 					{if isset($field['suffix'])}&nbsp;{$field['suffix']|strval}{/if}
 				{elseif $field['type'] == 'password'}
-					<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="" />
+					<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if} />
 					{if isset($field['suffix'])}&nbsp;{$field['suffix']|strval}{/if}
 				{elseif $field['type'] == 'textarea'}
 					<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|escape:'htmlall':'UTF-8'}</textarea>