Fix bug for Renamed users