Fix issues with validating the right user