diff --git a/modules/modperl.cpp b/modules/modperl.cpp
index a7f31c4c..45e63733 100644
--- a/modules/modperl.cpp
+++ b/modules/modperl.cpp
@@ -847,11 +847,11 @@ XS(XS_ZNC_COREListen)
 #ifdef HAVE_LIBSSL
 			if ( iUseSSL != 0 )
 			{
-				if ( CFile::Exists( g_ModPerl->GetUser()->GetPemLocation() ) )
-					pSock->SetPemLocation( g_ModPerl->GetUser()->GetPemLocation() );
+				if ( CFile::Exists( CZNC::Get().GetPemLocation() ) )
+					pSock->SetPemLocation( CZNC::Get().GetPemLocation() );
 				else
 				{
-					g_ModPerl->PutModule( "PEM File does not exist! (looking for " + g_ModPerl->GetUser()->GetPemLocation() + ")" );
+					g_ModPerl->PutModule( "PEM File does not exist! (looking for " + CZNC::Get().GetPemLocation() + ")" );
 					bContinue = false;
 				}
 			}
diff --git a/modules/schat.cpp b/modules/schat.cpp
index edacee1b..70d1e21f 100644
--- a/modules/schat.cpp
+++ b/modules/schat.cpp
@@ -20,6 +20,9 @@ using std::pair;
  * Author: imaginos <imaginos@imaginos.net>
  * 
  * $Log$
+ * Revision 1.18  2005/09/20 04:31:19  prozacx
+ * Changed from CUser::GetPemLocation() to CZNC::GetPemLocation()
+ *
  * Revision 1.17  2005/09/07 05:14:28  prozacx
  * Renamed md5.cpp/h to MD5.cpp/h
  *
@@ -188,7 +191,7 @@ public:
 
 		if ( m_sPemFile.empty() )
 		{
-			m_sPemFile = m_pUser->GetPemLocation();
+			m_sPemFile = CZNC::Get().GetPemLocation();
 		}
 
 		if (!CFile::Exists(m_sPemFile)) {