diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index d48730647..d1e345155 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -138,8 +138,8 @@ class e_form
 		}	
 		else 
 		{
-			$target = str_replace("&", "&", $target);
-			$text = "\n<form {$class} action='{$target}' id='".$this->name2id($name)."' method = '{$method}'{$autoComplete}>\n";
+			$target = str_replace("&", "&amp;", $target);
+			$text = "\n<form {$class} action='{$target}' id='".$this->name2id($name)."' method = '{$method}'{$autoComplete}>\n";
 		}
 		return $text;	
 	}
@@ -4453,6 +4453,7 @@ class e_form
 	}
 }
 
+// DEPRECATED - use above methods instead ($frm)
 class form 
 {
 	function form_open($form_method, $form_action, $form_name = "", $form_target = "", $form_enctype = "", $form_js = "")