diff --git a/src/syncterm/rlogin.c b/src/syncterm/rlogin.c
index d86fdd40eec48d6d3b28798fcaa4c8af08be4db3..84259597d1637dce8c5a3c7fff839bb7aedcf9b9 100644
--- a/src/syncterm/rlogin.c
+++ b/src/syncterm/rlogin.c
@@ -192,8 +192,7 @@ int rlogin_connect(struct bbslist *bbs)
 			rbuf[++idx] = 0;
 
 			/* It says ERROR, but this is a good response to PING. */
-			// TODO: Should there be a \r\n after "ERROR"?
-			if (strstr(rbuf,"ERROR")) {
+			if (strstr(rbuf,"ERROR\r\n")) {
 				break;
 			}
 
@@ -222,8 +221,7 @@ int rlogin_connect(struct bbslist *bbs)
 			rbuf[++idx] = 0;
 
 			/* GHost says it's launching the program, so pass terminal to user. */
-			// TODO: Should there be a \r\n after "OK"?
-			if (strstr(rbuf,"OK")) {
+			if (strstr(rbuf,"OK\r\n")) {
 				break;
 			}