Improved get User functionality