diff --git a/src/remote/client/interface.cpp b/src/remote/client/interface.cpp
index 17dad93f5e..471ca9f600 100644
--- a/src/remote/client/interface.cpp
+++ b/src/remote/client/interface.cpp
@@ -7400,9 +7400,6 @@ static rem_port* analyze(ClntAuthBlock& cBlock, PathName& attach_name, unsigned
  *
  **************************************/
 
-	rem_port* port = NULL;
-	int inet_af = AF_UNSPEC;
-
 	cBlock.loadClnt(pb, &parSet);
 	pb.deleteWithTag(parSet.auth_block);
 
@@ -7414,8 +7411,12 @@ static rem_port* analyze(ClntAuthBlock& cBlock, PathName& attach_name, unsigned
 	Auth::setLegacySSP(legacySSP);
 #endif
 
+	rem_port* port;
 	while (true)
 	{
+		port = NULL;
+		int inet_af = AF_UNSPEC;
+
 		authenticateStep0(cBlock);
 		const NoCaseString savePluginName(cBlock.plugins.name());