diff --git a/appl/telnet/telnet/commands.c b/appl/telnet/telnet/commands.c
index dc187a052..4218b0137 100644
--- a/appl/telnet/telnet/commands.c
+++ b/appl/telnet/telnet/commands.c
@@ -2336,18 +2336,8 @@ tn(int argc, char **argv)
 #endif
     } while (connected == 0);
     cmdrc(hostp, hostname);
-    if (autologin && user == NULL) {
-	struct passwd *pw;
-
-	user = (char *)get_default_username();
-	if (user == NULL ||
-	    ((pw = k_getpwnam((char *)user)) && pw->pw_uid != getuid())) {
-		if ((pw = k_getpwuid(getuid())))
-			user = pw->pw_name;
-		else
-			user = NULL;
-	}
-    }
+    if (autologin && user == NULL)
+	user = (char *)get_default_username ();
     if (user) {
 	env_define((unsigned char *)"USER", (unsigned char *)user);
 	env_export((unsigned char *)"USER");