diff --git INSTALL.txt INSTALL.txt
index 9cf391f..ed66f89 100644
--- INSTALL.txt
+++ INSTALL.txt
@@ -60,11 +60,6 @@ Installation
    
    Under 'Form Settings' when editing the Webform, add the following code for 'Additional Processing':
 
-	<?php
-	require_once(drupal_get_path('module', 'salesforcewebform') . '/salesforcewebform.module');
-	$form_state = salesforcewebform_process($node, $form, $form_state);
-	?>
-
    For each component, you must select a Salesforce field to map to.  The default fields
    are listed for easy mapping.  Custom fields must be entered into the "Administer" ->
    "Site Configuration" -> "Salesforce Webform" screen.
diff --git salesforcefields.info salesforcefields.info
index 87a8e5a..ee0df3a 100644
--- salesforcefields.info
+++ salesforcefields.info
@@ -3,5 +3,4 @@ description = "Get Salesforce Fields for the SalesforceWebform module"
 core = 6.x
 dependencies[] = salesforcewebform
 dependencies[] = webform
-dependencies[] = webform_php
-package = Integration
\ No newline at end of file
+package = Integration
diff --git salesforcewebform.module salesforcewebform.module
old mode 100644
new mode 100755
index 444bbee..8c06fe0
--- salesforcewebform.module
+++ salesforcewebform.module
@@ -19,6 +19,11 @@ function salesforcewebform_form_alter(&$form, &$form_state, $form_id) {
 		if ( empty($node->use_salesforce) ) {
 			return ;
 		}
+    // Add the submit handler after the existing Webform submit handler,
+    // but before the second Webform handler. Pop off the first one and add
+    // ours second.
+    $first = array_shift($form['#submit']);
+    array_unshift($form['#submit'], $first, 'salesforcewebform_client_submit');
 	}
 	
 	// handle editing of webform nodes
@@ -100,6 +105,16 @@ function salesforcewebform_form_alter(&$form, &$form_state, $form_id) {
 }
 
 /**
+ * Additional Webform Processing during submit
+ * @param array $form
+ * @param array $form_state
+ */
+function salesforcewebform_client_submit($form, &$form_state) {
+  $node = $form['#parameters'][2];
+  $form_state = salesforcewebform_process($node, $form, $form_state);
+}
+
+/**
  * Intercept webform_component_edit_form and replace the component form_key with the salesforcewebform 
  * component form_key (if only its not empty) 
  * @param array $form