Fix contact user data. Make code simpler.