diff --git a/auth/baron_login.php b/auth/baron_login.php
index 8db5c8b..71e7994 100644
--- a/auth/baron_login.php
+++ b/auth/baron_login.php
@@ -4,7 +4,7 @@ require_once __DIR__ . '/common.php';
 auth_session_start_if_needed();
 
 $site = ($_GET['site'] ?? 'egbim') === 'eng' ? 'eng' : 'egbim';
-$returnUrl = trim((string) ($_GET['return_url'] ?? auth_site_qna_url($site)));
+$returnUrl = trim((string) ($_GET['return_url'] ?? (auth_site_base_url($site) . '/index.php')));
 
 if (!auth_baron_is_configured()) {
     auth_script_redirect('BARON-SSO 설정이 아직 완료되지 않았습니다.', auth_site_base_url($site) . '/index.php');
diff --git a/egbim/skin/member/basic/login.skin.php b/egbim/skin/member/basic/login.skin.php
index b5b7b82..50818b7 100644
--- a/egbim/skin/member/basic/login.skin.php
+++ b/egbim/skin/member/basic/login.skin.php
@@ -53,7 +53,7 @@
                                 <button type="submit" id="btn_login">로그인</button>
                             </div>
                             <div class="join_btn_wrap" style="margin-top:10px;">
-                                <a href="/auth/baron_login?site=egbim&amp;return_url=/egbim/bbs/descope_qa_list.php" style="display:block; width:100%; text-align:center; padding:14px 16px; border:1px solid #0f3a2f; border-radius:10px; color:#0f3a2f; font-weight:700;">BARON-SSO 로그인</a>
+                                <a href="/auth/baron_login?site=egbim&amp;return_url=/egbim/index.php" style="display:block; width:100%; text-align:center; padding:14px 16px; border:1px solid #0f3a2f; border-radius:10px; color:#0f3a2f; font-weight:700;">BARON-SSO 로그인</a>
                             </div>
                             <p style="margin-bottom:20px; font-size:16px; font-weight:700; color:#c62828; line-height:1.6; text-align:center;">eg-bim 1.5.1 버전 이상 사용자는 baron-sso로 로그인해야 합니다.</p>
                             <div class="btn_go">
diff --git a/eng/skin/member/basic/login.skin.php b/eng/skin/member/basic/login.skin.php
index 59afd1d..907e5d9 100644
--- a/eng/skin/member/basic/login.skin.php
+++ b/eng/skin/member/basic/login.skin.php
@@ -52,7 +52,7 @@
                                 <button type="submit" id="btn_login">Login</button>
                             </div>
                             <div class="join_btn_wrap" style="margin-top:10px;">
-                                <a href="/auth/baron_login?site=eng&amp;return_url=/eng/bbs/descope_qa_list.php" style="display:block; width:100%; text-align:center; padding:14px 16px; border:1px solid #0f3a2f; border-radius:10px; color:#0f3a2f; font-weight:700;">BARON-SSO Login</a>
+                                <a href="/auth/baron_login?site=eng&amp;return_url=/eng/index.php" style="display:block; width:100%; text-align:center; padding:14px 16px; border:1px solid #0f3a2f; border-radius:10px; color:#0f3a2f; font-weight:700;">BARON-SSO Login</a>
                             </div>
                             <p style="margin-top:10px; font-size:16px; font-weight:700; color:#c62828; line-height:1.6; text-align:center;">eg-bim 1.5.1 버전 이상 사용자는 baron-sso로 로그인해야 합니다.</p>
                             <div class="btn_go">