More work on users handling.