diff --git a/User.cpp b/User.cpp
index 4779b489..47a2d866 100644
--- a/User.cpp
+++ b/User.cpp
@@ -487,8 +487,8 @@ const vector<CChan*>& CUser::GetChans() const { return m_vChans; }
 const vector<CServer*>& CUser::GetServers() const { return m_vServers; }
 const CNick& CUser::GetIRCNick() const { return m_IRCNick; }
 const string& CUser::GetIRCServer() const { return m_sIRCServer; }
-const string& CUser::GetQuitMsg() const { return m_sQuitMsg; }
-const string& CUser::GetVersionReply() const { return m_sVersionReply; }
+string CUser::GetQuitMsg() const { return (!m_sQuitMsg.empty()) ? m_sQuitMsg : "ZNC by prozac - http://znc.sourceforge.net"; }
+string CUser::GetVersionReply() const { return (!m_sVersionReply.empty()) ? m_sVersionReply : "ZNC by prozac - http://znc.sourceforge.net"; }
 unsigned int CUser::GetBufferCount() const { return m_uBufferCount; }
 bool CUser::KeepBuffer() const { return m_bKeepBuffer; }
 // !Getters
diff --git a/User.h b/User.h
index 4726c33c..137747fa 100644
--- a/User.h
+++ b/User.h
@@ -108,8 +108,8 @@ public:
 	const vector<CServer*>& GetServers() const;
 	const CNick& GetIRCNick() const;
 	const string& GetIRCServer() const;
-	const string& GetQuitMsg() const;
-	const string& GetVersionReply() const;
+	string GetQuitMsg() const;
+	string GetVersionReply() const;
 	unsigned int GetBufferCount() const;
 	bool KeepBuffer() const;
 	// !Getters