diff --git a/system1-factory/api/db/migrations/20260331_fix_deduct_days_precision.sql b/system1-factory/api/db/migrations/20260331_fix_deduct_days_precision.sql
index 5552b06..f0933fd 100644
--- a/system1-factory/api/db/migrations/20260331_fix_deduct_days_precision.sql
+++ b/system1-factory/api/db/migrations/20260331_fix_deduct_days_precision.sql
@@ -30,3 +30,5 @@ INSERT IGNORE INTO company_holidays (holiday_date, holiday_name, holiday_type, c
 INSERT IGNORE INTO company_holidays (holiday_date, holiday_name, holiday_type, created_by) VALUES ('2026-10-03', '개천절', 'PAID', 1);
 INSERT IGNORE INTO company_holidays (holiday_date, holiday_name, holiday_type, created_by) VALUES ('2026-10-09', '한글날', 'PAID', 1);
 INSERT IGNORE INTO company_holidays (holiday_date, holiday_name, holiday_type, created_by) VALUES ('2026-12-25', '크리스마스', 'PAID', 1);
+-- NULL leader_user_id 복구 (created_by로 채움)
+UPDATE tbm_sessions SET leader_user_id = created_by WHERE leader_user_id IS NULL;
diff --git a/system1-factory/web/js/tbm-create.js b/system1-factory/web/js/tbm-create.js
index 490d87f..d535800 100644
--- a/system1-factory/web/js/tbm-create.js
+++ b/system1-factory/web/js/tbm-create.js
@@ -41,12 +41,14 @@
       W.sessionDate = window.TbmUtils.getTodayKST();
       var user = window.TbmState.getUser();
       if (user) {
-        if (user.user_id) {
-          var worker = window.TbmState.allWorkers.find(function(w) { return w.user_id === user.user_id; });
+        var uid = user.user_id || user.id;
+        if (uid) {
+          var worker = window.TbmState.allWorkers.find(function(w) { return String(w.user_id) === String(uid); });
           if (worker) {
             W.leaderId = worker.user_id;
             W.leaderName = worker.worker_name;
           } else {
+            W.leaderId = uid;
             W.leaderName = user.name || '';
           }
         } else {
diff --git a/system1-factory/web/js/tbm-mobile.js b/system1-factory/web/js/tbm-mobile.js
index 64ae1bf..0c364bf 100644
--- a/system1-factory/web/js/tbm-mobile.js
+++ b/system1-factory/web/js/tbm-mobile.js
@@ -64,7 +64,7 @@
       return;
     }
 
-    currentUser = JSON.parse(localStorage.getItem('sso_user') || '{}');
+    currentUser = (typeof getCurrentUser === 'function' ? getCurrentUser() : window.currentUser) || {};
     await loadData();
   });
 
@@ -125,7 +125,7 @@
   function isMySession(s) {
     var role = (currentUser.role || '').toLowerCase();
     if (role === 'admin' || role === 'system' || role === 'support_team') return true;
-    var userId = currentUser.user_id;
+    var userId = currentUser.user_id || currentUser.id;
     var userName = currentUser.name;
     return (userId && (String(s.created_by) === String(userId) ||
                        String(s.leader_user_id) === String(userId))) ||