diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc
index d1641d02..86ffbd45 100644
--- a/wrenchboard/src/shared_tool/account.cc
+++ b/wrenchboard/src/shared_tool/account.cc
@@ -1846,14 +1846,14 @@ long account_session_check(CVars in, CVars out) {
            if (load_db_record(out, "SELECT s.* FROM members_session s LEFT JOIN members m ON m.id=s.member_id "
                                     " WHERE  s.updated > (now() - interval '%lu minutes') "
                                     " AND s.session='%s'", session_expire_minutes, in["sessionid"].c_str()) > 0) {
-                //pgsql_exec("UPDATE members_session SET updated=NOW() WHERE member_id=%ld AND session='%s'", in["sessionid"].c_str());
+                  pgsql_exec("UPDATE members_session SET updated=NOW() WHERE member_id=%ld AND session='%s'", in["sessionid"].c_str());
                 ret = PHP_API_OK;
             }
         return ret;
         }
         long member_id = REQ_LONG(in, "member_id", 1, -1);
-        if (load_db_record(out, "SELECT uid FROM members_session WHERE session='%s' AND member_id = %lu", in["sessionid"].c_str(),member_id) > 0) {
-            if (SessionCheck(out["uid"].Long(), in["sessionid"].c_str(), 0) > 0) {
+        if (load_db_record(out, "SELECT uid, id AS member_id FROM members_session WHERE session='%s' AND member_id = %lu", in["sessionid"].c_str(),member_id) > 0) {
+            if (VerifySession(out["member_id"].Long(), in["sessionid"].c_str()) > 0) {
                 out["status"] = "Session valid";
                 ret = PHP_API_OK;
             }
diff --git a/wrenchboard/src/shared_tool/wrenchboard_api_main.cc b/wrenchboard/src/shared_tool/wrenchboard_api_main.cc
index b91a6216..ab87803e 100644
--- a/wrenchboard/src/shared_tool/wrenchboard_api_main.cc
+++ b/wrenchboard/src/shared_tool/wrenchboard_api_main.cc
@@ -249,7 +249,8 @@ long wrenchboard_api_main(CVars in, CVars &out) {
             break;
 
         case WRENCHBOARD_SESSION_CHECK:
-            retval = account_session_check(in, out);
+              retval = account_session_check(in, out);
+            return retval;
             break;
 
         case 1000000055: