diff --git a/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c
index ec2947b95..98dc83399 100644
--- a/appl/telnet/libtelnet/encrypt.c
+++ b/appl/telnet/libtelnet/encrypt.c
@@ -496,8 +496,11 @@ EncryptAutoDec(int on)
 void
 encrypt_not(void)
 {
-  if(encrypt_verbose)
-    printf("[ Connection is NOT encrypted ]\r\n");
+    if (encrypt_verbose)
+  	printf("[ Connection is NOT encrypted ]\r\n");
+    else
+  	printf("\r\n*** Connection not encrypted! "
+	       "Communication may be eavesdropped. ***\r\n");
 }
 
 /*
diff --git a/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c
index e1d1c7a06..7f8a4ffc6 100644
--- a/appl/telnet/telnet/main.c
+++ b/appl/telnet/telnet/main.c
@@ -255,7 +255,6 @@ int main(int argc, char **argv)
 		}
 	}
 
-	encrypt_verbose_quiet(1);
 	if (autologin == -1) {		/* esc@magic.fi; force  */
 #if defined(AUTHENTICATION)
 		autologin = 1;
diff --git a/appl/telnet/telnetd/sys_term.c b/appl/telnet/telnetd/sys_term.c
index 379e873f7..8f556e51a 100644
--- a/appl/telnet/telnetd/sys_term.c
+++ b/appl/telnet/telnetd/sys_term.c
@@ -361,16 +361,16 @@ char *line = Xline;
 char *myline = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
 #endif	/* CRAY */
 
-static char* k_ptsname(int p)
+#ifndef HAVE_PTSNAME
+static char *ptsname(int fd)
 {
-#ifdef HAVE_PTSNAME
-  return ptsname(p);
-#endif
 #ifdef HAVE_TTYNAME
-  return ttyname(p);
-#endif
+  return ttyname(fd);
+#else
   return NULL;
+#endif
 }
+#endif
 
 int getpty(int *ptynum)
 {
@@ -400,7 +400,7 @@ int getpty(int *ptynum)
 #ifdef HAVE_UNLOCKPT
 	    unlockpt(p);
 #endif
-	    strcpy(line, k_ptsname(p));
+	    strcpy(line, ptsname(p));
 	    return p;
 	  }
 	}
@@ -1247,7 +1247,7 @@ startslave(char *host, int autologin, char *autoname)
       {
 	char *tbuf =
 	  "\r\n*** Connection not encrypted! "
-	  "Communication may be eavesdropped.***\r\n";
+	  "Communication may be eavesdropped. ***\r\n";
 #ifdef ENCRYPTION
 	if (encrypt_output == 0 || decrypt_input == 0)
 #endif