diff --git a/wrenchboard/src/shared_tool/account_mngt.cc b/wrenchboard/src/shared_tool/account_mngt.cc
index 981949ba..5302610d 100644
--- a/wrenchboard/src/shared_tool/account_mngt.cc
+++ b/wrenchboard/src/shared_tool/account_mngt.cc
@@ -554,7 +554,7 @@ long CreateWrenchBoardAccount(CVars in, CVars &out) {
     //const char * loc = getenv('REMOTE_ADDR');
     //in["loc"]  = loc;
     try {
-        long lonkF = load_db_record(out, "SELECT *,id AS pending_id FROM members_pending WHERE verify_link ='%s' AND password =md5('%s') AND expire > now() LIMIT 1", in["verify_link"].c_str(), in["password"].c_str());
+        long lonkF = load_db_record(out, "SELECT *,id AS pending_id FROM members_pending WHERE verify_link ='%s' AND password =md5('%s') AND username ='%s' AND status= 1 AND expire > now() LIMIT 1", in["verify_link"].c_str(), in["password"].c_str(), in["username"].c_str());
         if (lonkF) {
          if (out["pending_id"].Long() >  0 ){
                 out["status"] = "prepare to create account";
diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index 8280b00b..5e0d5c8b 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -296,7 +296,7 @@ long account_email(long mailtype, CVars in, CVars &out) {
     bool exclude_email = true;
     char * server_name = getenv("SERVER_NAME");
 	
-	out["server_name"] = CfgReadChar("system.server_name");
+	out["server_name"] = "http://localhost:9082/"; // CfgReadChar("system.server_name");
     form.LetStr("server_name",  out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
     form.LetStr("site_trade_name", "Connecting Opportunities");