Make userId UUID, close #1332