Added user-id handling.