diff --git a/security/ChangePasswordForm.php b/security/ChangePasswordForm.php
index 19666c430..7d53ab0f6 100755
--- a/security/ChangePasswordForm.php
+++ b/security/ChangePasswordForm.php
@@ -23,11 +23,11 @@ class ChangePasswordForm extends Form {
 		if(!$fields) {
 			$fields = new FieldSet();
 			if(Member::currentUser() && (!isset($_REQUEST['h']) || !Member::member_from_autologin($_REQUEST['h']))) {
-				$fields->push(new EncryptField("OldPassword",_t('Member.YOUROLDPASSWORD', "Your old password")));
+				$fields->push(new PasswordField("OldPassword",_t('Member.YOUROLDPASSWORD', "Your old password")));
 			}
 
-			$fields->push(new EncryptField("NewPassword1", _t('Member.NEWPASSWORD', "New Password")));
-			$fields->push(new EncryptField("NewPassword2", _t('Member.CONFIRMNEWPASSWORD', "Confirm New Password")));
+			$fields->push(new PasswordField("NewPassword1", _t('Member.NEWPASSWORD', "New Password")));
+			$fields->push(new PasswordField("NewPassword2", _t('Member.CONFIRMNEWPASSWORD', "Confirm New Password")));
 		}
 		if(!$actions) {
 			$actions = new FieldSet(
diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php
index 884f077be..119a8ba9f 100644
--- a/security/MemberLoginForm.php
+++ b/security/MemberLoginForm.php
@@ -52,7 +52,7 @@ class MemberLoginForm extends LoginForm {
 					new HiddenField("AuthenticationMethod", null, $this->authenticator_class, $this),
 					new TextField("Email", _t('Member.EMAIL'),
 						Session::get('SessionForms.MemberLoginForm.Email'), null, $this),
-					new EncryptField("Password", _t('Member.PASSWORD'), null, $this)
+					new PasswordField("Password", _t('Member.PASSWORD'), null, $this)
 				);
 				if(Security::$autologin_enabled) {
 					$fields->push(new CheckboxField(