diff --git a/code/UserDefinedForm.php b/code/UserDefinedForm.php
index eeb3b9b..91aa5f3 100755
--- a/code/UserDefinedForm.php
+++ b/code/UserDefinedForm.php
@@ -380,11 +380,15 @@ class UserDefinedForm_Controller extends Page_Controller {
 								$submittedField->Value = "";
 							}
 							$submittedField->write();
-						}
-								
+						}				
 					break;						
 				}
 			}
+			elseif($field->hasMethod('getValueFromData')) { 
+				$values[$field->Title] = Convert::linkIfMatch($field->getValueFromData($data)); 
+			} else { 
+				if(isset($data[$field->Name])) $values[$field->Title] = Convert::linkIfMatch($data[$field->Name]); 
+			}
 		}	
 		$emailData = array(
 			"Sender" => Member::currentUser(),