Fix #15 - use user Id in place of out dated user Guid.