diff --git a/css/default_shop.css b/css/default_shop.css
index 4006ebb4b..529adbffb 100644
--- a/css/default_shop.css
+++ b/css/default_shop.css
@@ -644,7 +644,7 @@ input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;col
 #sod_frm_pay .frm_input {background:#fff !important}
 #sod_frm_pay .frm_input:focus {color:#000}
 
-#sod_frm_paysel {padding:10px;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
+#sod_frm_paysel {margin:0 0 20px;padding:10px;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
 #sod_frm_paysel legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #settle_bank {margin:10px 0 0}
 
diff --git a/shop/orderform.php b/shop/orderform.php
index c7fb7f3f9..6c1bbe7cb 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -360,8 +360,8 @@ set_session('ss_order_uniqid', $od_id);
         <tr>
             <th scope="row"><label for="od_pwd">비밀번호</label></th>
             <td>
-                <input type="password" name="od_pwd" id="od_pwd" maxlength="20">
-                영,숫자 3~20자 (주문서 조회시 필요)
+                <span class="frm_info">영,숫자 3~20자 (주문서 조회시 필요)</span>
+                <input type="password" name="od_pwd" id="od_pwd" class="frm_input" maxlength="20">
             </td>
         </tr>
         <?php } ?>
@@ -477,6 +477,9 @@ set_session('ss_order_uniqid', $od_id);
         <h2>결제정보</h2>
 
         <?php
+        if (!$default['de_card_point'])
+            echo '<p><strong>무통장입금</strong> 이외의 결제 수단으로 결제하시는 경우 포인트를 적립해드리지 않습니다.</p>';
+
         $multi_settle == 0;
         $checked = '';
 
@@ -579,9 +582,6 @@ set_session('ss_order_uniqid', $od_id);
 
         }
 
-        if (!$default['de_card_point'])
-            echo '<p><strong>무통장입금</strong> 이외의 결제 수단으로 결제하시는 경우 포인트를 적립해드리지 않습니다.</p>';
-
         if ($multi_settle == 0)
             echo '<p>결제할 방법이 없습니다.<br>운영자에게 알려주시면 감사하겠습니다.</p>';
         ?>
diff --git a/skin/member/shop_basic/login.skin.php b/skin/member/shop_basic/login.skin.php
index 756c3563c..e99d86fab 100644
--- a/skin/member/shop_basic/login.skin.php
+++ b/skin/member/shop_basic/login.skin.php
@@ -10,17 +10,18 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     <form name="flogin" action="<?php echo $login_action_url ?>" onsubmit="return flogin_submit(this);" method="post">
     <input type="hidden" name="url" value='<?php echo $login_url ?>'>
 
-    <fieldset class="cbg">
-        <label for="login_id" class="login_id">회원아이디<strong class="sound_only">필수</strong></label>
+    <fieldset id="mb_login_fs">
+        <legend>회원로그인</legend>
+        <label for="login_id" class="login_id">회원아이디<strong class="sound_only"> 필수</strong></label>
         <input type="text" name="mb_id" id="login_id" required class="frm_input required" size="20" maxLength="20">
-        <label for="login_pw" class="login_pw">패스워드<strong class="sound_only">필수</strong></label>
+        <label for="login_pw" class="login_pw">패스워드<strong class="sound_only"> 필수</strong></label>
         <input type="password" name="mb_password" id="login_pw" required class="frm_input required" size="20" maxLength="20">
         <input type="submit" value="로그인" class="btn_submit">
         <input type="checkbox" name="auto_login" id="login_auto_login">
         <label for="login_auto_login">자동로그인</label>
     </fieldset>
 
-    <section>
+    <section id="mb_login_info">
         <h2>회원로그인 안내</h2>
         <p>
             회원아이디 및 패스워드가 기억 안나실 때는 아이디/패스워드 찾기를 이용하십시오.<br>
@@ -32,12 +33,81 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         </div>
     </section>
 
+    </form>
+
+    <? // 쇼핑몰 사용시 여기부터 ?>
+    <? if ($default[de_level_sell] == 1) { // 상품구입 권한 ?>
+
+        <!-- 주문하기, 신청하기 -->
+        <? if (preg_match("/orderform.php/", $url)) { ?>
+
+    <section id="mb_login_notmb">
+        <h2>비회원 구매</h2>
+
+        <p>
+            비회원으로 주문하시는 경우 포인트는 지급하지 않습니다.
+        </p>
+
+        <div id="guest_privacy">
+            <?=$default[de_guest_privacy]?>
+        </div>
+
+        <label for="agree">개인정보수집에 대한 내용을 읽었으며 이에 동의합니다.</label>
+        <input type="checkbox" id="agree" value="1">
+
+        <div class="btn_confirm">
+            <a href="javascript:guest_submit(document.flogin);" class="btn02">비회원으로 구매하기</a>
+        </div>
+
+        <script>
+        function guest_submit(f)
+        {
+            if (document.getElementById('agree')) {
+                if (!document.getElementById('agree').checked) {
+                    alert("개인정보수집에 대한 내용을 읽고 이에 동의하셔야 합니다.");
+                    return;
+                }
+            }
+
+            //f.url.value = "<?=$g4[shop_path]?>/orderform.php";
+            //f.action = "<?=$g4[shop_path]?>/orderform.php";
+            f.url.value = "<?=$url?>";
+            f.action = "<?=$url?>";
+            f.submit();
+        }
+        </script>
+    </section>
+
+        <? } else if (preg_match("/orderinquiry.php$/", $url)) { ?>
+
+    <fieldset id="mb_login_od">
+        <legend>비회원 주문조회</legend>
+
+        <form name="forderinquiry" method="post" action="<?=urldecode($url)?>" autocomplete="off">
+
+        <label for="od_id" class="od_id">주문서번호<strong class="sound_only"> 필수</strong></label>
+        <input type="text" name="od_id" value="<? echo $od_id ?>" id="od_id" required class="frm_input required" size="20">
+        <label for="id_pwd" class="od_pwd">패스워드<strong class="sound_only"> 필수</strong></label>
+        <input type="password" name="od_pwd" size="20" id="od_pwd" required class="frm_input required">
+        <input type="submit" value="확인" class="btn_submit">
+
+        </form>
+    </fieldset>
+
+    <section id="mb_login_odinfo">
+        <h2>비회원 주문조회 안내</h2>
+        <p>메일로 발송해드린 주문서의 <strong>주문번호</strong> 및 주문 시 입력하신 <strong>비밀번호</strong>를 정확히 입력해주십시오.</p>
+    </section>
+
+        <? } ?>
+
+    <? } ?>
+    <? // 쇼핑몰 사용시 여기까지 반드시 복사해 넣으세요 ?>
+
     <div class="btn_confirm">
         <a href="<?php echo G4_URL ?>/">메인으로 돌아가기</a>
     </div>
 
-    </form>
-
 </div>
 
 <script>
diff --git a/skin/member/shop_basic/style.css b/skin/member/shop_basic/style.css
index e22a1d86e..9edc14762 100644
--- a/skin/member/shop_basic/style.css
+++ b/skin/member/shop_basic/style.css
@@ -37,14 +37,29 @@
 #mb_login {margin:0 auto;padding:100px 0;width:500px}
 #mb_login h1 {margin:0 0 20px;font-size:1.3em}
 #mb_login h2 {margin:0}
-#mb_login fieldset {position:relative;margin:0;padding:20px 20px 20px 95px;border:1px solid #cfded8;border-bottom:0;background:#fff}
-#mb_login label {letter-spacing:-0.1em}
-#mb_login .login_id {position:absolute;top:26px;left:95px}
-#mb_login .login_pw {position:absolute;top:52px;left:95px}
-#mb_login .frm_input {display:block;margin:0 0 5px 80px}
-#mb_login .btn_submit {position:absolute;top:20px;left:335px;height:49px}
-#mb_login section {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f7f7f2}
-#mb_login section div {text-align:right}
+#mb_login_fs {position:relative;margin:0;padding:20px 20px 20px 95px;border:1px solid #cfded8;border-bottom:0;background:#fff}
+#mb_login_fs legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#mb_login_fs label {letter-spacing:-0.1em}
+#mb_login_fs .login_id {position:absolute;top:26px;left:95px}
+#mb_login_fs .login_pw {position:absolute;top:52px;left:95px}
+#mb_login_fs .frm_input {display:block;margin:0 0 5px 80px}
+#mb_login_fs .btn_submit {position:absolute;top:20px;left:335px;height:49px}
+#mb_login_info {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f7f7f2}
+#mb_login_info div {text-align:right}
+
+#mb_login_notmb {position:relative;margin:0 0 20px;padding:20px;border:1px solid #cfded8;background:#fff}
+#mb_login_notmb #guest_privacy {margin:0 0 10px;padding:10px;height:150px;border:1px solid #e9e9e9;overflow:auto}
+#mb_login_notmb .btn_confirm {padding:10px 0 0}
+
+#mb_login_od {position:relative;margin:0;padding:20px 20px 20px 95px;border:1px solid #cfded8;border-bottom:0;background:#fff}
+#mb_login_od legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#mb_login_od label {letter-spacing:-0.1em}
+#mb_login_od .od_id {position:absolute;top:26px;left:95px}
+#mb_login_od .od_pwd {position:absolute;top:52px;left:95px}
+#mb_login_od .frm_input {display:block;margin:0 0 5px 80px}
+#mb_login_od .btn_submit {position:absolute;top:20px;left:335px;width:52px;height:49px}
+#mb_login_odinfo {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f7f7f2}
+#mb_login_odinfo div {text-align:right}
 
 /* 쪽지 */
 #memo_view section {margin:0 auto 20px;padding:20px;width:87%}