diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index d4dcd2906..ea58a0f1f 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -151,16 +151,13 @@ class order extends Component {
       isSpin: true,
     });
     let option_id = e.key === "all" ? undefined : e.key;
-    // this.setState({
-    //   ["${id}s"]: name,
-    // });
     this.state.select_params[`${id}`] = option_id;
     this.state.select_params.page = 1;
     this.state[`${id}s`] = name;
     if(current_user){
-      if(this.state.select_params.author_id && this.state.select_params.author_id === current_user.user_id){
+      if(this.state.select_params.author_id && (parseInt(this.state.select_params.author_id) === current_user.user_id)){
         this.state.author_id = current_user.user_id;
-      }else if(this.state.select_params.assigned_to_id && this.state.select_params.assigned_to_id === current_user.user_id){
+      }else if(this.state.select_params.assigned_to_id && (parseInt(this.state.select_params.assigned_to_id) === current_user.user_id)){
         this.state.assigned_to_id = current_user.user_id;
       }else{
         this.setState({