diff --git a/adm/mail_form.php b/adm/mail_form.php
index 547beadf0..a95035be2 100644
--- a/adm/mail_form.php
+++ b/adm/mail_form.php
@@ -10,6 +10,8 @@ $html_title = '회원메일';
 if ($w == 'u') {
     $html_title .= '수정';
     $readonly = ' readonly';
+    
+    $ma_id = (int) $ma_id;
 
     $sql = " select * from {$g5['mail_table']} where ma_id = '{$ma_id}' ";
     $ma = sql_fetch($sql);
diff --git a/adm/mail_update.php b/adm/mail_update.php
index ff539cd55..68c85ae71 100644
--- a/adm/mail_update.php
+++ b/adm/mail_update.php
@@ -9,11 +9,13 @@ auth_check($auth[$sub_menu], 'w');
 
 check_admin_token();
 
+$ma_id = isset($_POST['ma_id']) ? (int) $_POST['ma_id'] : 0;
+$ma_subject = isset($_POST['ma_subject']) ? strip_tags($_POST['ma_subject']) : '';
+
 if ($w == '')
 {
     $sql = " insert {$g5['mail_table']}
-                set ma_id = '{$_POST['ma_id']}',
-                     ma_subject = '{$_POST['ma_subject']}',
+                set ma_subject = '{$ma_subject}',
                      ma_content = '{$_POST['ma_content']}',
                      ma_time = '".G5_TIME_YMDHIS."',
                      ma_ip = '{$_SERVER['REMOTE_ADDR']}' ";
@@ -22,16 +24,16 @@ if ($w == '')
 else if ($w == 'u')
 {
     $sql = " update {$g5['mail_table']}
-                set ma_subject = '{$_POST['ma_subject']}',
+                set ma_subject = '{$ma_subject}',
                      ma_content = '{$_POST['ma_content']}',
                      ma_time = '".G5_TIME_YMDHIS."',
                      ma_ip = '{$_SERVER['REMOTE_ADDR']}'
-                where ma_id = '{$_POST['ma_id']}' ";
+                where ma_id = '{$ma_id}' ";
     sql_query($sql);
 }
 else if ($w == 'd')
 {
-	$sql = " delete from {$g5['mail_table']} where ma_id = '{$_POST['ma_id']}' ";
+	$sql = " delete from {$g5['mail_table']} where ma_id = '{$ma_id}' ";
     sql_query($sql);
 }
 
diff --git a/config.php b/config.php
index 3e76468a5..2f2af33d8 100644
--- a/config.php
+++ b/config.php
@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.0');
+define('G5_GNUBOARD_VER', '5.4.0.1');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);
diff --git a/mobile/skin/member/basic/password_lost.skin.php b/mobile/skin/member/basic/password_lost.skin.php
index c912d0746..10ccb24a8 100644
--- a/mobile/skin/member/basic/password_lost.skin.php
+++ b/mobile/skin/member/basic/password_lost.skin.php
@@ -18,12 +18,12 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="email" id="mb_email" name="mb_email" placeholder="이메일주소(필수)" required class="frm_input email">
         </fieldset>
         <?php echo captcha_html(); ?>
+        <div class="win_btn">
+            <button type="submit" class="btn_submit">정보찾기</button>
+            <button type="button" onclick="window.close();" class="btn_close">창닫기</button>
+        </div>
 		</form>
 	</div>
-    <div class="win_btn">
-        <button type="submit" class="btn_submit">정보찾기</button>
-        <button type="button" onclick="window.close();" class="btn_close">창닫기</button>
-    </div>
 </div>
 
 <script>
diff --git a/skin/member/basic/password_lost.skin.php b/skin/member/basic/password_lost.skin.php
index 14d134bb0..56f27ff58 100644
--- a/skin/member/basic/password_lost.skin.php
+++ b/skin/member/basic/password_lost.skin.php
@@ -19,12 +19,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="text" name="mb_email" id="mb_email" required class="required frm_input full_input email" size="30" placeholder="E-mail 주소">
         </fieldset>
         <?php echo captcha_html();  ?>
+
+        <div class="win_btn">
+            <button type="submit" class="btn_submit">확인</button>
+            <button type="button" onclick="window.close();" class="btn_close">창닫기</button>  
+        </div>
         </form>
     </div>
-    <div class="win_btn">
-    	<button type="submit" class="btn_submit">확인</button>
-    	<button type="button" onclick="window.close();" class="btn_close">창닫기</button>  
-    </div>    
 </div>
 
 <script>
diff --git a/theme/basic/mobile/skin/member/basic/password_lost.skin.php b/theme/basic/mobile/skin/member/basic/password_lost.skin.php
index c912d0746..10ccb24a8 100644
--- a/theme/basic/mobile/skin/member/basic/password_lost.skin.php
+++ b/theme/basic/mobile/skin/member/basic/password_lost.skin.php
@@ -18,12 +18,12 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="email" id="mb_email" name="mb_email" placeholder="이메일주소(필수)" required class="frm_input email">
         </fieldset>
         <?php echo captcha_html(); ?>
+        <div class="win_btn">
+            <button type="submit" class="btn_submit">정보찾기</button>
+            <button type="button" onclick="window.close();" class="btn_close">창닫기</button>
+        </div>
 		</form>
 	</div>
-    <div class="win_btn">
-        <button type="submit" class="btn_submit">정보찾기</button>
-        <button type="button" onclick="window.close();" class="btn_close">창닫기</button>
-    </div>
 </div>
 
 <script>
diff --git a/theme/basic/skin/member/basic/password_lost.skin.php b/theme/basic/skin/member/basic/password_lost.skin.php
index 14d134bb0..903b3a4fd 100644
--- a/theme/basic/skin/member/basic/password_lost.skin.php
+++ b/theme/basic/skin/member/basic/password_lost.skin.php
@@ -19,12 +19,12 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="text" name="mb_email" id="mb_email" required class="required frm_input full_input email" size="30" placeholder="E-mail 주소">
         </fieldset>
         <?php echo captcha_html();  ?>
+        <div class="win_btn">
+            <button type="submit" class="btn_submit">확인</button>
+            <button type="button" onclick="window.close();" class="btn_close">창닫기</button>  
+        </div>
         </form>
     </div>
-    <div class="win_btn">
-    	<button type="submit" class="btn_submit">확인</button>
-    	<button type="button" onclick="window.close();" class="btn_close">창닫기</button>  
-    </div>    
 </div>
 
 <script>