diff --git a/mozilla/extensions/xforms/nsXFormsSendElement.cpp b/mozilla/extensions/xforms/nsXFormsSendElement.cpp
index 393caffc85e..cabdbc8c2db 100644
--- a/mozilla/extensions/xforms/nsXFormsSendElement.cpp
+++ b/mozilla/extensions/xforms/nsXFormsSendElement.cpp
@@ -58,9 +58,10 @@ nsXFormsSendElement::HandleAction(nsIDOMEvent* aEvent,
   if (!mElement)
     return NS_OK;
 
-  nsAutoString submission;
-  mElement->GetAttribute(NS_LITERAL_STRING("submission"), submission);
-  if (submission.IsEmpty())
+  NS_NAMED_LITERAL_STRING(submission, "submission");
+  nsAutoString submissionID;
+  mElement->GetAttribute(NS_LITERAL_STRING("submission"), submissionID);
+  if (submissionID.IsEmpty())
     return NS_OK;
 
   nsCOMPtr<nsIDOMDocument> doc;
@@ -69,11 +70,11 @@ nsXFormsSendElement::HandleAction(nsIDOMEvent* aEvent,
     return NS_OK;
 
   nsCOMPtr<nsIDOMElement> el;
-  doc->GetElementById(submission, getter_AddRefs(el));
-  if (!el)
-    return NS_OK;
-  
-  //XXX Check the element type when we have the submission element
+  doc->GetElementById(submissionID, getter_AddRefs(el));
+
+  if (!el || !nsXFormsUtils::IsXFormsElement(el, submission)) {
+    return nsXFormsUtils::DispatchEvent(mElement, eEvent_BindingException);
+  }
   
   return nsXFormsUtils::DispatchEvent(el, eEvent_Submit);
 }
diff --git a/mozilla/extensions/xforms/nsXFormsTriggerElement.cpp b/mozilla/extensions/xforms/nsXFormsTriggerElement.cpp
index 3b08603e0f6..6fb34b44f1b 100644
--- a/mozilla/extensions/xforms/nsXFormsTriggerElement.cpp
+++ b/mozilla/extensions/xforms/nsXFormsTriggerElement.cpp
@@ -159,8 +159,9 @@ nsXFormsSubmitElement::HandleDefault(nsIDOMEvent *aEvent, PRBool *aHandled)
   if (!(*aHandled = type.EqualsLiteral("DOMActivate")))
     return NS_OK;
 
+  NS_NAMED_LITERAL_STRING(submission, "submission");
   nsAutoString submissionID;
-  mElement->GetAttribute(NS_LITERAL_STRING("submission"), submissionID);
+  mElement->GetAttribute(submission, submissionID);
 
   nsCOMPtr<nsIDOMDocument> ownerDoc;
   mElement->GetOwnerDocument(getter_AddRefs(ownerDoc));
@@ -168,7 +169,11 @@ nsXFormsSubmitElement::HandleDefault(nsIDOMEvent *aEvent, PRBool *aHandled)
 
   nsCOMPtr<nsIDOMElement> submissionElement;
   ownerDoc->GetElementById(submissionID, getter_AddRefs(submissionElement));
-  NS_ENSURE_STATE(submissionElement);
+  
+  if (!submissionElement ||
+      !nsXFormsUtils::IsXFormsElement(submissionElement, submission)) {
+    return nsXFormsUtils::DispatchEvent(mElement, eEvent_BindingException);
+  }
 
   nsCOMPtr<nsIDOMEventTarget> targ = do_QueryInterface(submissionElement);
   NS_ASSERTION(targ, "All elements should support nsIDOMEventTarget");