diff --git a/hwe/a_npcList.php b/hwe/a_npcList.php
index 2f3a8a65..b9ce4a15 100644
--- a/hwe/a_npcList.php
+++ b/hwe/a_npcList.php
@@ -59,8 +59,13 @@ foreach (getAllNationStaticInfo() as $nation) {
     $nationName[$nation['nation']] = $nation['name'];
 }
 
-
 $generalList = $db->query('SELECT npc,nation,name,owner_name,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1');
+$generalListFromPool = $db->query('SELECT npc,nation,name,owner_name,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general JOIN select_pool on general.no = select_pool.general_id where npc=0');
+
+if($generalListFromPool){
+    $generalList = array_merge($generalListFromPool, $generalList);
+}
+
 $sortType = [
     1 => ['name', true],
     2 => ['nation', true],
diff --git a/hwe/func.php b/hwe/func.php
index 6979e89d..5489552e 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1224,7 +1224,7 @@ function updateOnline()
 
     //동접수
     $before5Min = TimeUtil::nowAddMinutes(-5);
-    $onlineUser = $db->query('SELECT no,name,nation FROM general WHERE lastrefresh > %s', $before5Min);
+    $onlineUser = $db->query('SELECT no,name,nation FROM general WHERE lastrefresh > %s AND npc < 2', $before5Min);
     $onlineNum = count($onlineUser);
     $onlineNationUsers = Util::arrayGroupBy($onlineUser, 'nation');
     
diff --git a/hwe/j_select_picked_general.php b/hwe/j_select_picked_general.php
index 392e7485..af50d30a 100644
--- a/hwe/j_select_picked_general.php
+++ b/hwe/j_select_picked_general.php
@@ -115,7 +115,10 @@ foreach(GameConst::$generalPoolAllowOption as $allowOption){
     }
 }
 
+$userNick = $ownerInfo['name'];
+
 $builder->setOwner($userID);
+$builder->setOwnerName($userNick);
 $builder->setKillturn(5);
 $builder->setNPCType(0);
 $builder->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $env['turnterm']));
@@ -135,7 +138,7 @@ $db->update('select_pool',[
     'reserved_until'=>null,
 ], '(owner=%i or reserved_until < %s) AND general_id is NULL', $userID, $now);
 
-$userNick = $ownerInfo['name'];
+
 $josaYi = JosaUtil::pick($userNick, '이');
 $generalName = $builder->getGeneralName();
 $josaRo = JosaUtil::pick($generalName, '로');
diff --git a/hwe/j_update_picked_general.php b/hwe/j_update_picked_general.php
index 6f25eb9f..56c7a3fc 100644
--- a/hwe/j_update_picked_general.php
+++ b/hwe/j_update_picked_general.php
@@ -132,6 +132,7 @@ if(key_exists('specialWar', $info)){
 $generalObj->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $turnterm));
 
 $userNick = $ownerInfo['name'];
+$generalObj->setVar('owner_name', $userNick);
 $josaYi = JosaUtil::pick($userNick, '이');
 
 $generalName = $info['generalName'];