diff --git a/forms/ConfirmedPasswordField.php b/forms/ConfirmedPasswordField.php
index f04337bd6..58e2681a4 100644
--- a/forms/ConfirmedPasswordField.php
+++ b/forms/ConfirmedPasswordField.php
@@ -95,6 +95,12 @@ class ConfirmedPasswordField extends FormField {
 		if($showOnClick) {
 			$this->children->push(new HiddenField("{$name}[_PasswordFieldVisible]"));
 		}
+
+		// disable auto complete
+		foreach($this->children as $child) {
+			$child->setAttribute('autocomplete', 'off');
+		}
+
 		$this->showOnClick = $showOnClick;
 		
 		// we have labels for the subfields
@@ -136,11 +142,13 @@ class ConfirmedPasswordField extends FormField {
 		foreach($this->children as $field) {
 			$field->setDisabled($this->isDisabled()); 
 			$field->setReadonly($this->isReadonly());
+
 			if(count($this->attributes)) {
 				foreach($this->attributes as $name => $value) {
 					$field->setAttribute($name, $value);
 				}
 			}
+
 			$content .= $field->FieldHolder();
 		}
 
diff --git a/javascript/ConfirmedPasswordField.js b/javascript/ConfirmedPasswordField.js
index 2036e2436..05814514a 100644
--- a/javascript/ConfirmedPasswordField.js
+++ b/javascript/ConfirmedPasswordField.js
@@ -1,5 +1,5 @@
 (function ($) {
-	$('.confirmedpassword .showOnClick a').live('click', function () {
+	$(document).on('click', '.confirmedpassword .showOnClick a', function () {
 		var $container = $('.showOnClickContainer', $(this).parent());
 
 		$container.toggle('fast', function() {