diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp
index 3fdebeb7e..f0020b0b6 100644
--- a/src/cpp/ripple/NetworkOPs.cpp
+++ b/src/cpp/ripple/NetworkOPs.cpp
@@ -1093,7 +1093,7 @@ bool NetworkOPs::recvValidation(const SerializedValidation::pointer& val)
 	return theApp->getValidations().addValidation(val);
 }
 
-Json::Value NetworkOPs::getServerInfo()
+Json::Value NetworkOPs::getServerInfo(bool admin)
 {
 	Json::Value info = Json::objectValue;
 
@@ -1111,8 +1111,13 @@ Json::Value NetworkOPs::getServerInfo()
 	if (mNeedNetworkLedger)
 		info["network_ledger"] = "waiting";
 
-	if (theConfig.VALIDATION_PUB.isValid())
-		info["pubkey_validator"] = theConfig.VALIDATION_PUB.humanNodePublic();
+	if (admin)
+	{
+		if (theConfig.VALIDATION_PUB.isValid())
+			info["pubkey_validator"] = theConfig.VALIDATION_PUB.humanNodePublic();
+		else
+			info["pubkey_validator"] = "none";
+	}
 	info["pubkey_node"] = theApp->getWallet().getNodePublic().humanNodePublic();
 
 
diff --git a/src/cpp/ripple/NetworkOPs.h b/src/cpp/ripple/NetworkOPs.h
index 3101880dd..ffaeb3873 100644
--- a/src/cpp/ripple/NetworkOPs.h
+++ b/src/cpp/ripple/NetworkOPs.h
@@ -243,7 +243,7 @@ public:
 	int getPreviousConvergeTime()		{ return mLastCloseConvergeTime; }
 	uint32 getLastCloseTime()			{ return mLastCloseTime; }
 	void setLastCloseTime(uint32 t)		{ mLastCloseTime = t; }
-	Json::Value getServerInfo();
+	Json::Value getServerInfo(bool admin);
 	uint32 acceptLedger();
 	boost::unordered_map<uint160,
 		std::list<LedgerProposal::pointer> >& peekStoredProposals() { return mStoredProposals; }
diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp
index 85a50fb00..5a41eb5f8 100644
--- a/src/cpp/ripple/RPCHandler.cpp
+++ b/src/cpp/ripple/RPCHandler.cpp
@@ -1305,7 +1305,7 @@ Json::Value RPCHandler::doServerInfo(Json::Value)
 {
 	Json::Value ret(Json::objectValue);
 
-	ret["info"]	= theApp->getOPs().getServerInfo();
+	ret["info"]	= theApp->getOPs().getServerInfo(mRole == ADMIN);
 
 	return ret;
 }