diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 32f491cc0..70a60781d 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -885,10 +885,17 @@
 
             unset($member_info->password);
 
+            // 사용자 그룹 설정
+            $group_srl_list = array_keys($member_info->group_list);
+
+            // 관리자 그룹일 경우 관리자로 지정
+            $admin_group = $oMemberModel->getAdminGroup();
+            if($admin_group->group_srl && in_array($admin_group->group_srl, $group_srl_list)) $member_info->is_admin = 'Y';
+            
             // 세션에 로그인 사용자 정보 저장
             $_SESSION['member_srl'] = $member_info->member_srl;
             $_SESSION['logged_info'] = $member_info;
-            $_SESSION['group_srls'] = array_keys($member_info->group_list);
+            $_SESSION['group_srls'] = $group_srl_list;
             $_SESSION['is_admin'] = $member_info->is_admin=='Y'?true:false;
 
             // 사용자 정보의 최근 로그인 시간을 기록
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index 494ce63f4..2b8ef6a73 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -7,19 +7,19 @@
     <col width="*" />
     <tr>
         <th rowspan="2">{$lang->user_id}</th>
-        <td><input type="text" name="user_id" /></td>
+        <td><input type="text" name="user_id" tabindex="1" /></td>
     </tr>
     <tr>
-        <td><input type="checkbox" name="remember_user_id" value="Y" /> {$lang->remember_user_id}</td>
+        <td><input type="checkbox" name="remember_user_id" value="Y" tabindex="4" /> {$lang->remember_user_id}</td>
     </tr>
     <tr>
         <th>{$lang->password}</th>
-        <td><input type="password" name="password" value="" /></td>
+        <td><input type="password" name="password" value="" tabindex="2" /></td>
     </tr>
     <tr>
         <td colspan="2">
+            <input type="submit" value="{$lang->cmd_login}" tabindex="3" />
             <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('act','')}'" />
-            <input type="submit" value="{$lang->cmd_login}" />
         </td>
     </tr>
     <tr>