diff --git a/v1/src/lib/Handlers/Users.handler.js b/v1/src/lib/Handlers/Users.handler.js
index 682629e..f7c8c12 100644
--- a/v1/src/lib/Handlers/Users.handler.js
+++ b/v1/src/lib/Handlers/Users.handler.js
@@ -94,8 +94,15 @@ function clean_user_data( data , company ){
     if( data.password ){ delete data.password; }
     if( data.company ){ delete data.company; }
     if( data.job_role ){
+        /** You can only modify the role of a user if it is in the following list */
+        const modifiable_roles = [
+            'manager',
+            'driver',
+            'staff',
+            'warehouse'
+        ];
         /// System can only create manager,driver or staff.
-        if( (data.job_role !== "manager") && (data.job_role !== "driver") && (data.job_role !== "staff") ){
+        if( !modifiable_roles.includes( data.job_role ) ){
             data.job_role = "staff";
         }
     }