diff --git a/CHANGELOG b/CHANGELOG
index 13013402e..f0f1a8855 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,3 +10,5 @@ Critical protocol changes
 ** "closeTime" DEPRECATED: use "close" or "close_human"
 * stream "rt_accounts" --> "accounts_proposed"
 * stream "rt_transactions" --> "transactions_proposed"
+* subscribe "username" --> "url_username"
+* subscribe "password" --> "url_password"
diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp
index 782fa8064..b543f6072 100644
--- a/src/cpp/ripple/RPCHandler.cpp
+++ b/src/cpp/ripple/RPCHandler.cpp
@@ -2639,8 +2639,16 @@ Json::Value RPCHandler::doSubscribe(Json::Value jvRequest, int& cost)
 			return rpcError(rpcNO_PERMISSION);
 
 		std::string	strUrl		= jvRequest["url"].asString();
-		std::string	strUsername	= jvRequest.isMember("username") ? jvRequest["username"].asString() : "";
-		std::string	strPassword	= jvRequest.isMember("password") ? jvRequest["password"].asString() : "";
+		std::string	strUsername	= jvRequest.isMember("url_username") ? jvRequest["url_username"].asString() : "";
+		std::string	strPassword	= jvRequest.isMember("url_password") ? jvRequest["url_password"].asString() : "";
+
+		// DEPRICATED
+		if (jvRequest.isMember("username"))
+			strUsername	= jvRequest["username"].asString();
+
+		// DEPRICATED
+		if (jvRequest.isMember("password"))
+			strPassword	= jvRequest["password"].asString();
 
 		ispSub	= mNetOps->findRpcSub(strUrl);
 		if (!ispSub)