Client & User identification improvements