diff --git a/web/edit/user/index.php b/web/edit/user/index.php
index b8ec3176..0aa0215d 100644
--- a/web/edit/user/index.php
+++ b/web/edit/user/index.php
@@ -7,8 +7,6 @@ $TAB = 'USER';
 
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 
 // Check user argument
 if (empty($_GET['user'])) {
@@ -165,6 +163,11 @@ if (!empty($_POST['save'])) {
     }
 }
 
+
+// Header
+include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
+
+
 // Panel
 if (!empty($_SESSION['look'])) {
     top_panel($user,$TAB);
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html
index 7bdbca7f..70ae8a01 100644
--- a/web/templates/user/edit_user.html
+++ b/web/templates/user/edit_user.html
@@ -89,27 +89,6 @@
                                     <input type="text" size="20" class="vst-input" name="v_email" <?php if (!empty($v_email)) echo "value=".htmlentities($v_email); ?>>
                                 </td>
                             </tr>
-                            <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('Package');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <select class="vst-list" name="v_package">
-                                        <?php
-                                            foreach ($packages as $key => $value) {
-                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";
-                                                $skey = "'".$key."'";
-                                                if (( $key == $v_package ) || ( $skey == $v_package)){
-                                                    echo 'selected' ;
-                                                }
-                                                echo ">".htmlentities($key)."</option>\n";
-                                            }
-                                        ?> 
-                                    </select>
-                                </td>
-                            </tr>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Language');?>
@@ -154,27 +133,6 @@
                                     <input type="text" size="20" class="vst-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=\"".htmlentities($v_lname)."\""; ?>>
                                 </td>
                             </tr>
-                            <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('SSH Access');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <select class="vst-list" name="v_shell">
-                                        <?php
-                                            foreach ($shells as $key => $value) {
-                                                echo "\t\t\t\t<option value=\"".htmlentities($value)."\"";
-                                                $svalue = "'".$value."'";
-                                                if (( $value == $v_shell ) || ($svalue == $v_shell )){
-                                                    echo 'selected' ;
-                                                }
-                                                echo ">".htmlentities($value)."</option>\n";
-                                            }
-                                        ?> 
-                                    </select>
-                                </td>
-                            </tr>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Default Name Servers');?>