Fixed userId saving bug