diff --git a/.htaccess b/.htaccess
index d5227a3..608709a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,4 @@
-    RewriteEngine On
+RewriteEngine On
    RewriteBase /
    RewriteCond %{REQUEST_FILENAME} !-f
    RewriteCond %{HTTPS} off
diff --git a/includes/func.class/general.func.php b/includes/func.class/general.func.php
index 2620eab..8ac98c2 100755
--- a/includes/func.class/general.func.php
+++ b/includes/func.class/general.func.php
@@ -555,7 +555,7 @@ function getModalStaff($id) {
                 <select id='position_edit' name='position_edit' class='form-control'>
                     <option " . ($value["position"] == 1 ? "selected" : "") . " value='1'>Admin</option>
                     <option " . ($value["position"] == 2 ? "selected" : "") . " value='2'>Branch Admin</option>
-                    <option " . ($value["position"] == 3 ? "selected" : "") . " value='2'>Staff</option>
+                    <option " . ($value["position"] == 3 ? "selected" : "") . " value='3'>Staff</option>
                 </select>
             </div>
         </div>
diff --git a/modul/common/company/editstaff.tpl.php b/modul/common/company/editstaff.tpl.php
index 1b5e1e5..e074cbe 100755
--- a/modul/common/company/editstaff.tpl.php
+++ b/modul/common/company/editstaff.tpl.php
@@ -130,7 +130,7 @@
 													<center>Name</center>
 												</th>
 												<th>
-													<center>Role</center>
+													<center>Position</center>
 												</th>
 												<?php if($_SESSION['group_id'] == 2){ ?>
 												<th>
diff --git a/modul/common/company/init.php b/modul/common/company/init.php
index e34a1b3..49def71 100755
--- a/modul/common/company/init.php
+++ b/modul/common/company/init.php
@@ -786,8 +786,9 @@ function the_company() {
 		$db->bind("id", $id);
 		$db->bind("position", $position);
 		$db->bind("branch", $branch);
+		echo $id;
 		// EXECUTE
-		$row = $db->query("UPDATE user_company SET position = :position, branch_id = :branch WHERE id = :id");
+		$row = $db->query("UPDATE user_company SET branch_id = :branch, position = :position WHERE id = :id");
 		if ($row) {
 			action_log($_SESSION['user_id'], "Edit Staff : ID - " . $id , "SUCCESS");
 			return new Response('SUCCESS', 200);