diff --git a/ZNCString.cpp b/ZNCString.cpp
index cad3a284..ab952458 100644
--- a/ZNCString.cpp
+++ b/ZNCString.cpp
@@ -407,6 +407,10 @@ CString CString::Token(unsigned int uPos, bool bRest, const CString& sSep, bool
 		return sRet;
 	}
 
+	return Token(uPos, bRest, sSep, bAllowEmpty);
+}
+
+CString CString::Token(unsigned int uPos, bool bRest, const CString& sSep, bool bAllowEmpty) const {
 	const char *sep_str = sSep.c_str();
 	size_t sep_len = sSep.length();
 	const char *str = c_str();
diff --git a/ZNCString.h b/ZNCString.h
index 44d28381..fda3d2ec 100644
--- a/ZNCString.h
+++ b/ZNCString.h
@@ -114,7 +114,8 @@ public:
 	CString Right(unsigned int uCount) const;
 
 	CString FirstLine() const { return Token(0, false, "\n"); }
-	CString Token(unsigned int uPos, bool bRest = false, const CString& sSep = " ", bool bAllowEmpty = false, const CString& sLeft = "", const CString& sRight = "", bool bTrimQuotes = true) const;
+	CString Token(unsigned int uPos, bool bRest = false, const CString& sSep = " ", bool bAllowEmpty = false) const;
+	CString Token(unsigned int uPos, bool bRest, const CString& sSep, bool bAllowEmpty, const CString& sLeft, const CString& sRight, bool bTrimQuotes = true) const;
 
 	unsigned int URLSplit(MCString& msRet) const;
 	unsigned int OptionSplit(MCString& msRet, bool bUpperKeys = false) const;