diff --git a/I2PControl.cpp b/I2PControl.cpp
index 062f02ff..eabea408 100644
--- a/I2PControl.cpp
+++ b/I2PControl.cpp
@@ -34,7 +34,7 @@ namespace client
 		m_SSLContext (m_Service, boost::asio::ssl::context::sslv23),
 		m_ShutdownTimer (m_Service)
 	{
-		GetOption("i2pcontrol.password", m_Password);
+		i2p::config::GetOption("i2pcontrol.password", m_Password);
 
 		// certificate				
 		auto path = GetPath ();
diff --git a/I2PControl.h b/I2PControl.h
index 9d97b267..7f8e7c30 100644
--- a/I2PControl.h
+++ b/I2PControl.h
@@ -47,6 +47,8 @@ namespace client
 	const char I2P_CONTROL_PARAM_ECHO[] = "Echo";	
 	const char I2P_CONTROL_PARAM_RESULT[] = "Result";	
 
+	const char I2P_CONTROL_I2PCONTROL_PASSWORD[] = "i2pcontrol.password";
+
 	// RouterInfo requests
 	const char I2P_CONTROL_ROUTER_INFO_UPTIME[] = "i2p.router.uptime";
 	const char I2P_CONTROL_ROUTER_INFO_VERSION[] = "i2p.router.version";