Add user management

Remove legacy step dependency