diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index 813f269f1..aab123d33 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -1,4 +1,5 @@
 <?
+define('_CAPTCHA_', 1);
 include_once('./_common.php');
 include_once($g4['path'].'/lib/register.lib.php');
 include_once($g4['path'].'/lib/mailer.lib.php');
@@ -301,16 +302,14 @@ if ($w == '') {
 
 
 // 사용자 코드 실행
-@include_once ($g4['path'].'/skin/member/'.$config[cf_member_skin].'/register_update.skin.php');
+@include_once ($g4['path'].'/skin/member/'.$config['cf_member_skin'].'/register_update.skin.php');
 
 
 if ($msg) 
     echo '<script>alert(\''.$msg.'\');</script>';
 
-$https_url = $g4['url'].'/'.$g4['bbs'];
-
 if ($w == "") {
-    goto_url($https_url.'/register_result.php');
+    goto_url($g4['bbs_url'].'/register_result.php');
 } else if ($w == 'u') {
     $row  = sql_fetch(" select mb_password from {$g4['member_table']} where mb_id = '{$member[mb_id]}' ");
     $tmp_password = $row['mb_password'];
@@ -319,9 +318,11 @@ if ($w == "") {
         set_session("ss_mb_id", "");
         alert('회원 정보가 수정 되었습니다.\n\nE-mail 주소가 변경되었으므로 다시 인증하셔야 합니다.', $g4['path']);
     } else {
+        alert('회원 정보가 수정 되었습니다.', $g4['url']);
+        /*
         echo '
         <html><title>회원정보수정</title><meta http-equiv="Content-Type" content="text/html; charset=$g4[charset]"></html><body>
-        <form name="fregisterupdate" method="post" action="'.$https_url.'/register_form.php">
+        <form name="fregisterupdate" method="post" action="'.$g4['bbs_url'].'/register_form.php">
         <input type="hidden" name="w" value="u">
         <input type="hidden" name="mb_id" value="'.$mb_id.'">
         <input type="hidden" name="mb_password" value="'.$tmp_password.'">
@@ -333,6 +334,7 @@ if ($w == "") {
         </script>
         </body>
         </html>';
+        */
     }
 }
 ?>
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 53489334c..af32393c9 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -120,7 +120,7 @@ function alert($msg='', $url='')
     if (!$msg) $msg = '올바른 방법으로 이용해 주십시오.';
     $msg = str_replace("\\n", "<br>", $msg);
 
-    if (!$url) $url = "javascript:history.go(-1);";
+    if (!$url) $url = $_SERVER['HTTP_REFERER'];
 
     /*
     //header("Content-Type: text/html; charset=$g4['charset']");
diff --git a/skin/member/neo/login.skin.php b/skin/member/neo/login.skin.php
index 55621ecbe..ded13682e 100644
--- a/skin/member/neo/login.skin.php
+++ b/skin/member/neo/login.skin.php
@@ -28,13 +28,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 </form>
 
 <script>
-$(document).ready(function(){
+$(function(){
     $("#login_auto_login").click(function(){
         if (this.checked) {
             this.checked = confirm("자동로그인을 사용하시면 다음부터 회원아이디와 패스워드를 입력하실 필요가 없습니다.\n\n공공장소에서는 개인정보가 유출될 수 있으니 사용을 자제하여 주십시오.\n\n자동로그인을 사용하시겠습니까?");
         }
     });
-}
+});
 
 function flogin_submit(f)
 {
diff --git a/skin/poll/neo/poll.skin.php b/skin/poll/neo/poll.skin.php
index 291be10d3..757797e42 100644
--- a/skin/poll/neo/poll.skin.php
+++ b/skin/poll/neo/poll.skin.php
@@ -19,11 +19,7 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
 <section id="poll">
     <header>
         <h2>설문조사</h2>
-<<<<<<< HEAD
         <? if ($is_admin == "super") { ?><a href="<?=$g4['admin_url']?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
-=======
-        <? if ($is_admin == "super") { ?><a href="<?=$g4[admin_path]?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문관리</a><? } ?>
->>>>>>> 8acf7f8c214b606db9e4d7b3533a916ca4171b83
         <p><?=$po['po_subject']?></p>
     </header>
     <ul>
