diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc
index 313d9e25..2e53c5c7 100644
--- a/wrenchboard/src/shared_tool/account.cc
+++ b/wrenchboard/src/shared_tool/account.cc
@@ -2289,7 +2289,7 @@ long LoginWrenchBoardAccount(CVars in, CVars &out) {
     } else {
     // before we go -- may be sign up not completed
 
-        ret = load_db_record(out, "SELECT id AS pending_id,uid AS pending_uid,username FROM members_pending WHERE status=1 AND LOWER(username)=LOWER('%s')", in["username"].c_str());
+        ret = load_db_record(out, "SELECT id AS pending_id,uid AS pending_uid,username,country FROM members_pending WHERE status=1 AND LOWER(username)=LOWER('%s') AND expire>now() ", in["username"].c_str());
         if (ret > 0) {
             out["pending_status"] = "Pending signup found";
         }