diff --git a/share/words.xml b/share/words.xml
index fa52a697..520cbc9e 100644
--- a/share/words.xml
+++ b/share/words.xml
@@ -1688,6 +1688,7 @@ Note: This is a permanent action! If you protect this server again later, a full
 		<key name="job_0474">The server: [#!variable!server!#] will now be forced off!</key>
 		<key name="job_0475">The subnode: [#!variable!subnode!#] is not ready. Configured: [#!variable!configured!#], maintenance mode: [#!variable!maintenance_mode!#].</key>
 		<key name="job_0476">Waiting for a bit, then will check again.</key>
+		<key name="job_0477">Waiting for both subnodes to be configured and out of maintenance mode.</key>
 
 		<!-- Log entries -->
 		<key name="log_0001">Starting: [#!variable!program!#].</key>
diff --git a/tools/anvil-join-anvil b/tools/anvil-join-anvil
index 1bd53d5a..6aef2ce8 100755
--- a/tools/anvil-join-anvil
+++ b/tools/anvil-join-anvil
@@ -2403,6 +2403,7 @@ sub wait_for_subnodes
 	}});
 	
 	my $waiting = 1;
+	update_progress($anvil, $anvil->data->{job}{progress}, "job_0477");
 	while($waiting)
 	{
 		my $waiting = 0;
@@ -2436,7 +2437,6 @@ sub wait_for_subnodes
 				$waiting = 1;
 				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { waiting => $waiting}});
 				
-				update_progress($anvil, $anvil->data->{job}{progress}, "job_0475,!!subnode!".$host_name."!!,!!configured!".$configured."!!,!!maintenance_mode!".$maintenance_mode."!!");
 				$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0475", variables => { 
 					subnode          => $host_name,
 					configured       => $configured,
@@ -2447,7 +2447,6 @@ sub wait_for_subnodes
 		
 		if ($waiting)
 		{
-			update_progress($anvil, $anvil->data->{job}{progress}, "job_0476");
 			$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0476"});
 			sleep 5;
 		}