Fix a couple bugs. Ensure container users can log on as service.