diff --git a/security/Security.php b/security/Security.php
index f0994b6b1..bc012bcff 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -671,7 +671,7 @@ class Security extends Controller {
 	 * @return Form Returns the lost password form
 	 */
 	public function ChangePasswordForm() {
-		return new ChangePasswordForm($this, 'ChangePasswordForm');
+        return Object::create('ChangePasswordForm', $this, 'ChangePasswordForm');
 	}
 
 	/**