Add user management

switch the order