diff --git a/api/services/EmailService.js b/api/services/EmailService.js
index 8ec3c71..97442d5 100644
--- a/api/services/EmailService.js
+++ b/api/services/EmailService.js
@@ -6,7 +6,8 @@ exports.sendRunEmails = function(runData) {
 	            + runData.name + "'! \n\n Put in your order here:\nhttp://www.lunchrun.me/#/run/"
 	            + runData.id + "/order/";
 	var options = {
-	    from: runData.creatorName + " <" + runData.creatorEmail + ">",
+        fromname: runData.creatorName + " via LunchRun.me",
+	    from: sails.config.email.fromAddress,
 	    subject: "You've been invited to a lunch run!",
         replyto: runData.creatorEmail
 	};
@@ -15,12 +16,13 @@ exports.sendRunEmails = function(runData) {
 	for (var idx in runData.invitees) {
 	    var invitee = runData.invitees[idx];
 	    var specificOptions = options;
-	    specificOptions.to = invitee.name + " <" + invitee.email + ">";
+	    specificOptions.to = invitee.email;
+        specificOptions.toname = invitee.name;
 	    specificOptions.text = emailText + invitee.name;
 
 	    console.log(specificOptions);
 
-        sendgrid.send(specificOptions, function(err, response) {
+        sg.send(specificOptions, function(err, response) {
 	        if (err) {
 	            console.log(err);
 	        } else {
@@ -28,6 +30,4 @@ exports.sendRunEmails = function(runData) {
 	        }
 	    });
 	}
-
-	transport.close();
 };
diff --git a/config/email.js b/config/email.js
index 3ee3de4..8f4b5c5 100644
--- a/config/email.js
+++ b/config/email.js
@@ -3,5 +3,6 @@
 //
 module.exports.email = {
     apiUser: "benjaminramey",
-    apiKey: "AVidasUPthub6pY3fFGe"
+    apiKey: "AVidasUPthub6pY3fFGe",
+    fromAddress: "ben.ramey@gmail.com"
 };