[TASK] refactoring for fe_users