diff --git a/stepmania/src/CryptManager.cpp b/stepmania/src/CryptManager.cpp
index b59e4280f4..63f0101213 100644
--- a/stepmania/src/CryptManager.cpp
+++ b/stepmania/src/CryptManager.cpp
@@ -3,7 +3,6 @@
 #include "RageUtil.h"
 #include "RageLog.h"
 #include "RageFile.h"
-#include "PrefsManager.h"
 #include "RageFileManager.h"
 
 #include "libtomcrypt/src/headers/tomcrypt.h"
@@ -167,9 +166,10 @@ CryptManager::CryptManager()
 	ltc_mp = ltm_desc;
 
 	g_pPRNG = new PRNGWrapper( &yarrow_desc );
+}
 
-	if( !PREFSMAN->m_bSignProfileData )
-		return;
+void CryptManager::GenerateGlobalKeys()
+{
 	//
 	// generate keys if none are available
 	//
diff --git a/stepmania/src/CryptManager.h b/stepmania/src/CryptManager.h
index 2f42fc0051..baa0455d1d 100644
--- a/stepmania/src/CryptManager.h
+++ b/stepmania/src/CryptManager.h
@@ -11,6 +11,7 @@ public:
 	CryptManager();
 	~CryptManager();
 
+	static void GenerateGlobalKeys();
 	static void GenerateRSAKey( unsigned int keyLength, RString &sPrivKey, RString &sPubKey );
 	static void GenerateRSAKeyToFile( unsigned int keyLength, RString privFilename, RString pubFilename );
 	static void SignFileToFile( RString sPath, RString sSignatureFile = "" );
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index add8760772..b49471f7a2 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1036,6 +1036,8 @@ int main(int argc, char* argv[])
 	if( !GetCommandlineArgument("ExportNsisStrings") && !GetCommandlineArgument("ExportLuaInformation") )
 		SONGMAN->InitAll( pLoadingWindow );	// this takes a long time
 	CRYPTMAN	= new CryptManager;		// need to do this before ProfileMan
+	if( PREFSMAN->m_bSignProfileData )
+		CRYPTMAN->GenerateGlobalKeys();
 	MEMCARDMAN	= new MemoryCardManager;
 	CHARMAN		= new CharacterManager;
 	PROFILEMAN	= new ProfileManager;