diff --git a/src/netif/ppp/auth.c b/src/netif/ppp/auth.c
index 82ee1550..79295c22 100644
--- a/src/netif/ppp/auth.c
+++ b/src/netif/ppp/auth.c
@@ -365,6 +365,7 @@ option_t auth_options[] = {
       "Get PAP user and password from file",
       OPT_PRIO | OPT_A2STRVAL, &uafname },
 
+#if 0
     { "user", o_string, user,
       "Set name for auth with peer", OPT_PRIO | OPT_STATIC,
       &explicit_user, MAXNAMELEN },
@@ -373,6 +374,7 @@ option_t auth_options[] = {
       "Password for authenticating us to the peer",
       OPT_PRIO | OPT_STATIC | OPT_HIDE,
       &explicit_passwd, MAXSECRETLEN },
+#endif
 
     { "usehostname", o_bool, &usehostname,
       "Must use hostname for authentication", 1 },
@@ -1414,7 +1416,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg)
 		free_wordlist(opts);
 	    if (addrs != 0)
 		free_wordlist(addrs);
-	    BZERO(passwd, sizeof(passwd));
+	    BZERO(ppp_settings.passwd, sizeof(ppp_settings.passwd));
 	    return ret? UPAP_AUTHACK: UPAP_AUTHNAK;
 	}
     }
@@ -1443,7 +1445,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg)
 	    ret = UPAP_AUTHACK;
 	    if (uselogin || login_secret) {
 		/* login option or secret is @login */
-		if (session_full(user, passwd, devnam, msg) == 0) {
+		if (session_full(ppp_settings.user, ppp_settings.passwd, devnam, msg) == 0) {
 		    ret = UPAP_AUTHNAK;
 		}
 	    } else if (session_mgmt) {
@@ -1454,8 +1456,8 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg)
 	    }
 	    if (secret[0] != 0 && !login_secret) {
 		/* password given in pap-secrets - must match */
-		if ((cryptpap || strcmp(passwd, secret) != 0)
-		    && strcmp(crypt(passwd, secret), secret) != 0)
+		if ((cryptpap || strcmp(ppp_settings.passwd, secret) != 0)
+		    && strcmp(crypt(ppp_settings.passwd, secret), secret) != 0)
 		    ret = UPAP_AUTHNAK;
 	    }
 	}
@@ -1489,7 +1491,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg)
 
     if (addrs != NULL)
 	free_wordlist(addrs);
-    BZERO(passwd, sizeof(passwd));
+    BZERO(ppp_settings.passwd, sizeof(ppp_settings.passwd));
     BZERO(secret, sizeof(secret));
 
     return ret;
@@ -1775,8 +1777,8 @@ get_secret(unit, client, server, secret, secret_len, am_server)
     struct wordlist *addrs, *opts;
     char secbuf[MAXWORDLEN];
 
-    if (!am_server && passwd[0] != 0) {
-	strlcpy(secbuf, passwd, sizeof(secbuf));
+    if (!am_server && ppp_settings.passwd[0] != 0) {
+	strlcpy(secbuf, ppp_settings.passwd, sizeof(secbuf));
     } else if (!am_server && chap_passwd_hook) {
 	if ( (*chap_passwd_hook)(client, secbuf) < 0) {
 	    error("Unable to obtain CHAP password for %s on %s from plugin",
@@ -1843,8 +1845,8 @@ get_srp_secret(unit, client, server, secret, am_server)
     char *filename;
     struct wordlist *addrs, *opts;
 
-    if (!am_server && passwd[0] != '\0') {
-	strlcpy(secret, passwd, MAXWORDLEN);
+    if (!am_server && ppp_settings.passwd[0] != '\0') {
+	strlcpy(secret, ppp_settings.passwd, MAXWORDLEN);
     } else {
 	filename = _PATH_SRPFILE;
 	addrs = NULL;
diff --git a/src/netif/ppp/options.c b/src/netif/ppp/options.c
index 65da3e36..f4c913d5 100644
--- a/src/netif/ppp/options.c
+++ b/src/netif/ppp/options.c
@@ -99,8 +99,8 @@ char	devnam[MAXPATHLEN];	/* Device name */
 bool	nodetach = 0;		/* Don't detach from controlling tty */
 bool	updetach = 0;		/* Detach once link is up */
 int	maxconnect = 0;		/* Maximum connect time */
-char	user[MAXNAMELEN];	/* Username for PAP */
-char	passwd[MAXSECRETLEN];	/* Password for PAP */
+//char	user[MAXNAMELEN];	/* Username for PAP */
+//char	passwd[MAXSECRETLEN];	/* Password for PAP */
 bool	persist = 0;		/* Reopen link after it goes down */
 char	our_name[MAXNAMELEN];	/* Our name for authentication purposes */
 bool	demand = 0;		/* do dial-on-demand */
diff --git a/src/netif/ppp/pppd.h b/src/netif/ppp/pppd.h
index 7238da36..eaf954f6 100644
--- a/src/netif/ppp/pppd.h
+++ b/src/netif/ppp/pppd.h
@@ -288,8 +288,8 @@ extern char	*disconnect_script; /* Script to disestablish physical link */
 extern char	*welcomer;	/* Script to welcome client after connection */
 extern char	*ptycommand;	/* Command to run on other side of pty */
 extern int	maxconnect;	/* Maximum connect time (seconds) */
-extern char	user[MAXNAMELEN];/* Our name for authenticating ourselves */
-extern char	passwd[MAXSECRETLEN];	/* Password for PAP or CHAP */
+//extern char	user[MAXNAMELEN];/* Our name for authenticating ourselves */
+//extern char	passwd[MAXSECRETLEN];	/* Password for PAP or CHAP */
 extern bool	auth_required;	/* Peer is required to authenticate */
 extern bool	persist;	/* Reopen link after it goes down */
 extern bool	uselogin;	/* Use /etc/passwd for checking PAP */