Fix ignore user bug
Merge branch 'fix_ignore_user_bug' into staging

* fix_ignore_user_bug:
  Fix ignore user bug