Manage users RC2, fix logic