Fix User Identification