Ben - user management initial
Alireza: update the first and second features