diff --git a/src/base/system.c b/src/base/system.c
index eec9a65d7..af5d6621c 100644
--- a/src/base/system.c
+++ b/src/base/system.c
@@ -2241,12 +2241,18 @@ void str_timestamp(char *buffer, int buffer_size)
 
 void str_escape(char **dst, const char *src, const char *end)
 {
-	while(*src && *dst < end)
+	while(*src && *dst + 1 < end)
 	{
 		if(*src == '"' || *src == '\\') // escape \ and "
-			*(*dst)++ = '\\';
+		{
+			if(*dst + 2 < end)
+				*(*dst)++ = '\\';
+			else
+				break;
+		}
 		*(*dst)++ = *src++;
 	}
+	**dst = 0;
 }
 
 int mem_comp(const void *a, const void *b, int size)
diff --git a/src/base/system.h b/src/base/system.h
index 9db3bdb44..acd35a7a6 100644
--- a/src/base/system.h
+++ b/src/base/system.h
@@ -1063,7 +1063,8 @@ void str_timestamp_ex(time_t time, char *buffer, int buffer_size, const char *fo
 		Escapes \ and " characters in a string.
 
 	Parameters:
-		dst - Destination array pointer, gets increased
+		dst - Destination array pointer, gets increased, will point to
+		      the terminating null.
 		src - Source array
 		end - End of destination array
 */
diff --git a/src/engine/client/friends.cpp b/src/engine/client/friends.cpp
index 2ad252f6c..3f6439b1f 100644
--- a/src/engine/client/friends.cpp
+++ b/src/engine/client/friends.cpp
@@ -167,16 +167,13 @@ void CFriends::ConfigSaveCallback(IConfig *pConfig, void *pUserData)
 	{
 		str_copy(aBuf, pSelf->m_Foes ? "add_foe " : "add_friend ", sizeof(aBuf));
 
-		char *pDst = aBuf+str_length(aBuf);
-		*pDst++ = '"';
+		str_append(aBuf, "\"", sizeof(aBuf));
+		char *pDst = aBuf + str_length(aBuf);
 		str_escape(&pDst, pSelf->m_aFriends[i].m_aName, pEnd);
-		*pDst++ = '"';
-		*pDst++ = ' ';
-
-		*pDst++ = '"';
+		str_append(aBuf, "\" \"", sizeof(aBuf));
+		pDst = aBuf + str_length(aBuf);
 		str_escape(&pDst, pSelf->m_aFriends[i].m_aClan, pEnd);
-		*pDst++ = '"';
-		*pDst++ = 0;
+		str_append(aBuf, "\"", sizeof(aBuf));
 
 		pConfig->WriteLine(aBuf);
 	}
diff --git a/src/engine/shared/config.cpp b/src/engine/shared/config.cpp
index c9d1c0e2d..6c8e55bec 100644
--- a/src/engine/shared/config.cpp
+++ b/src/engine/shared/config.cpp
@@ -26,10 +26,9 @@ class CConfig : public IConfig
 	CCallback m_aCallbacks[MAX_CALLBACKS];
 	int m_NumCallbacks;
 
-	void EscapeParam(char *pDst, const char *pSrc, int size)
+	void EscapeParam(char *pDst, const char *pSrc, int Size)
 	{
-		str_escape(&pDst, pSrc, pDst + size);
-		*pDst = 0;
+		str_escape(&pDst, pSrc, pDst + Size);
 	}
 
 public:
diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp
index a3780a280..a63f2b253 100644
--- a/src/engine/shared/console.cpp
+++ b/src/engine/shared/console.cpp
@@ -738,13 +738,10 @@ void CConsole::ConToggle(IConsole::IResult *pResult, void *pUser)
 		{
 			CStrVariableData *pData = static_cast<CStrVariableData *>(pUserData);
 			const char *pStr = !str_comp(pData->m_pStr, pResult->GetString(1)) ? pResult->GetString(2) : pResult->GetString(1);
-			str_copy(aBuf, pResult->GetString(0), sizeof(aBuf));
+			str_format(aBuf, sizeof(aBuf), "%s \"", pResult->GetString(0));
 			char *pDst = aBuf + str_length(aBuf);
-			*pDst++ = ' ';
-			*pDst++ = '"';
 			str_escape(&pDst, pStr, aBuf + sizeof(aBuf));
-			*pDst++ = '"';
-			*pDst++ = 0;
+			str_append(aBuf, "\"", sizeof(aBuf));
 			pConsole->ExecuteLine(aBuf);
 			aBuf[0] = 0;
 		}
diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp
index d52c43ab2..94e0f038f 100644
--- a/src/game/client/components/binds.cpp
+++ b/src/game/client/components/binds.cpp
@@ -293,20 +293,18 @@ void CBinds::ConfigSaveCallback(IConfig *pConfig, void *pUserData)
 	CBinds *pSelf = (CBinds *)pUserData;
 
 	char aBuffer[256];
-	char *pEnd = aBuffer+sizeof(aBuffer)-8;
+	char *pEnd = aBuffer+sizeof(aBuffer);
 	pConfig->WriteLine("unbindall");
 	for(int i = 0; i < KEY_LAST; i++)
 	{
 		if(!pSelf->m_apKeyBindings[i])
 			continue;
-		str_format(aBuffer, sizeof(aBuffer), "bind %s ", pSelf->Input()->KeyName(i));
+		str_format(aBuffer, sizeof(aBuffer), "bind %s \"", pSelf->Input()->KeyName(i));
 
 		// process the string. we need to escape some characters
 		char *pDst = aBuffer + str_length(aBuffer);
-		*pDst++ = '"';
 		str_escape(&pDst, pSelf->m_apKeyBindings[i], pEnd);
-		*pDst++ = '"';
-		*pDst++ = 0;
+		str_append(aBuffer, "\"", sizeof(aBuffer));
 
 		pConfig->WriteLine(aBuffer);
 	}