User manager changes and changed uniqueName to id