Improve checking who we are in users management