diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 99e0c2f323a..e7becb5c3c3 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -174,11 +174,11 @@ static inline void passthru(STD_PARA)
 static inline void handle_form(STD_PARA) 
 {
 	if (ctx->tag.len == 4 && strncasecmp(ctx->tag.c, "form", 4) == 0) {
-		smart_str_appends(&ctx->result, "<INPUT TYPE=\"HIDDEN\" NAME=\""); 
+		smart_str_appends(&ctx->result, "<input type=\"hidden\" name=\""); 
 		smart_str_append(&ctx->result, &ctx->q_name);
-		smart_str_appends(&ctx->result, "\" VALUE=\"");
+		smart_str_appends(&ctx->result, "\" value=\"");
 		smart_str_append(&ctx->result, &ctx->q_value);
-		smart_str_appends(&ctx->result, "\">");
+		smart_str_appends(&ctx->result, "\" />");
 	}
 }
 
diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index 3c6678538c1..30606580973 100644
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -172,11 +172,11 @@ static inline void passthru(STD_PARA)
 static inline void handle_form(STD_PARA) 
 {
 	if (ctx->tag.len == 4 && strncasecmp(ctx->tag.c, "form", 4) == 0) {
-		smart_str_appends(&ctx->result, "<INPUT TYPE=\"HIDDEN\" NAME=\""); 
+		smart_str_appends(&ctx->result, "<input type=\"hidden\" name=\""); 
 		smart_str_append(&ctx->result, &ctx->q_name);
-		smart_str_appends(&ctx->result, "\" VALUE=\"");
+		smart_str_appends(&ctx->result, "\" value=\"");
 		smart_str_append(&ctx->result, &ctx->q_value);
-		smart_str_appends(&ctx->result, "\">");
+		smart_str_appends(&ctx->result, "\" />");
 	}
 }