diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index 7453c05e..03d10a1e 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -386,21 +386,21 @@ long market_email(long mailtype, CVars in, CVars &out) {
                 break;
 
             case WRENCHBOARD_MARKET_PLAN01_START:
-                if (load_db_record(x, "SELECT * FROM members WHERE id =1")) {
+                if (load_db_record(x, "SELECT * FROM market_import WHERE id = %lu", in["import_id"].Long())) {
                     vars2form(x, form);
                     form.LetStr("subject", "View opportunities at");
-                    //form.LetStr("email", x["parent_email"].c_str());
-                    form.LetStr("email", "ameye@chiefsoft.com");
+                    form.LetStr("email", x["email"].c_str());
+                    //form.LetStr("email", "ameye@chiefsoft.com");
                     form.Email("MARKET/market_invite_step1.mailfile");
                 }
                 break;
 
                 case WRENCHBOARD_MARKET_PLAN01_NEXT1:
-                if (load_db_record(x, "SELECT * FROM members WHERE id =1")) {
+                if (load_db_record(x, "SELECT * FROM market_import WHERE id = %lu", in["import_id"].Long())) {
                     vars2form(x, form);
                     form.LetStr("subject", "View opportunities at");
-                    //form.LetStr("email", x["parent_email"].c_str());
-                    form.LetStr("email", "ameye@chiefsoft.com");
+                    form.LetStr("email", x["email"].c_str());
+                    //form.LetStr("email", "ameye@chiefsoft.com");
                     form.Email("MARKET/market_invite_step1.mailfile");
                 }
                 break;
diff --git a/wrenchboard/src/shared_tool/market.cc b/wrenchboard/src/shared_tool/market.cc
index 699bc6cb..49c299b8 100644
--- a/wrenchboard/src/shared_tool/market.cc
+++ b/wrenchboard/src/shared_tool/market.cc
@@ -51,7 +51,7 @@ logfmt(logINFO, "WrenchMarketImport()");
     try {
          out["total_record"] = "0";
         const PGresult *res;
-        res = pgsql_query("SELECT * FROM market_import WHERE status =1 LIMIT 4");
+        res = pgsql_query("SELECT id AS  import_id,* FROM market_import WHERE status =1 LIMIT 4");
 
         if (res != NULL && pgsql_num_rows(res) > 0) {
             out["total_record"] = pgsql_num_rows(res);
@@ -61,9 +61,7 @@ logfmt(logINFO, "WrenchMarketImport()");
                 if (f.empty()) continue;
                 CVars rec;
                 map_to_cvars(f, rec);
-
-               market_email(WRENCHBOARD_MARKET_PLAN01_START, rec, rec);
-
+                market_email(WRENCHBOARD_MARKET_PLAN01_START, rec, rec);
             }
         }
         ret = PHP_API_OK;