diff --git a/src/cpp/ripple/Config.cpp b/src/cpp/ripple/Config.cpp
index 8d0656e3c0..129f25965f 100644
--- a/src/cpp/ripple/Config.cpp
+++ b/src/cpp/ripple/Config.cpp
@@ -60,7 +60,7 @@
 #define DEFAULT_FEE_OPERATION			1
 
 Config theConfig;
-const char* ALPHABET = NULL;
+const char* ALPHABET = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz";
 
 void Config::setup(const std::string& strConf, bool bTestNet, bool bQuiet)
 {
@@ -89,9 +89,8 @@ void Config::setup(const std::string& strConf, bool bTestNet, bool bQuiet)
 	SIGN_VALIDATION		= TESTNET ? sHP_TestNetValidation		: sHP_Validation;
 	SIGN_PROPOSAL		= TESTNET ? sHP_TestNetProposal			: sHP_Proposal;
 
-	ALPHABET			= TESTNET
-		? "RPShNAF39wBUDnEGHJKLM4pQrsT7VWXYZ2bcdeCg65jkm8ofqi1tuvaxyz"
-		: "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz";
+	if (TESTNET)
+		ALPHABET = "RPShNAF39wBUDnEGHJKLM4pQrsT7VWXYZ2bcdeCg65jkm8ofqi1tuvaxyz";
 
 	if (!strConf.empty())
 	{
diff --git a/src/cpp/ripple/RippleAddress.cpp b/src/cpp/ripple/RippleAddress.cpp
index 93fdf7b607..6f90d140ab 100644
--- a/src/cpp/ripple/RippleAddress.cpp
+++ b/src/cpp/ripple/RippleAddress.cpp
@@ -758,8 +758,6 @@ bool RippleAddress::setSeedGeneric(const std::string& strText)
 	bool			bResult	= true;
 	uint128			uSeed;
 
-	ALPHABET = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz";
-
 	if (strText.empty()
 		|| naTemp.setAccountID(strText)
 		|| naTemp.setAccountPublic(strText)