made client initialization process a bit more secure