diff --git a/src/Client.cpp b/src/Client.cpp
index d362c228..795815bc 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -816,7 +816,7 @@ void CClient::HandleCap(const CString& sLine)
 		for (SCString::iterator i = ssOfferCaps.begin(); i != ssOfferCaps.end(); ++i) {
 			sRes += *i + " ";
 		}
-		RespondCap("LS :" + sRes + "userhost-in-names multi-prefix server-time");
+		RespondCap("LS :" + sRes + "userhost-in-names multi-prefix znc.in/server-time");
 		m_bInCap = true;
 	} else if (sSubCmd.Equals("END")) {
 		m_bInCap = false;
@@ -838,7 +838,7 @@ void CClient::HandleCap(const CString& sLine)
 			if (sCap.TrimPrefix("-"))
 				bVal = false;
 
-			bool bAccepted = ("multi-prefix" == sCap) || ("userhost-in-names" == sCap) || ("server-time" == sCap);
+			bool bAccepted = ("multi-prefix" == sCap) || ("userhost-in-names" == sCap) || ("znc.in/server-time" == sCap);
 			GLOBALMODULECALL(IsClientCapSupported(this, sCap, bVal), &bAccepted);
 
 			if (!bAccepted) {
@@ -858,7 +858,7 @@ void CClient::HandleCap(const CString& sLine)
 				m_bNamesx = bVal;
 			} else if ("userhost-in-names" == *it) {
 				m_bUHNames = bVal;
-			} else if ("server-time" == *it) {
+			} else if ("znc.in/server-time" == *it) {
 				m_bServerTime = bVal;
 			}
 			GLOBALMODULECALL(OnClientCapRequest(this, *it, bVal), NOTHING);
@@ -897,7 +897,7 @@ void CClient::HandleCap(const CString& sLine)
 		}
 		if (m_bServerTime) {
 			m_bServerTime = false;
-			ssRemoved.insert("server-time");
+			ssRemoved.insert("znc.in/server-time");
 		}
 		CString sList = "";
 		for (SCString::iterator i = ssRemoved.begin(); i != ssRemoved.end(); ++i) {