diff --git a/src/common/inbound.c b/src/common/inbound.c
index f4ae6a81..b10d9cf8 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -1815,14 +1815,14 @@ inbound_login_end (session *sess, char *text, const message_tags_data *tags_data
 			return;
 
 		/* send nickserv password */
-		if (net && net->pass && inbound_nickserv_login (serv))
+		if (net && serv->password[0] && inbound_nickserv_login (serv))
 		{
-			serv->p_ns_identify (serv, net->pass);
+			serv->p_ns_identify (serv, serv->password);
 		}
 
 		/* wait for join if command or nickserv set */
 		if (net && prefs.hex_irc_join_delay
-			&& ((net->pass && inbound_nickserv_login (serv))
+			&& ((serv->password[0] && inbound_nickserv_login (serv))
 				|| net->commandlist))
 		{
 			serv->joindelay_tag = fe_timeout_add_seconds (prefs.hex_irc_join_delay, check_autojoin_channels, serv);
diff --git a/src/common/outbound.c b/src/common/outbound.c
index 60ad2c43..b3b4ce90 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -4868,9 +4868,9 @@ command_insert_vars (session *sess, char *cmd)
 				break;
 
 			case 'p':
-				if (mynet->pass)
+				if (sess->server->password[0])
 				{
-					g_string_append (expanded, mynet->pass);
+					g_string_append (expanded, sess->server->password);
 				}
 				cmd++;
 				break;