diff --git a/tools/anvil-join-anvil b/tools/anvil-join-anvil
index 9f801811..5451acfd 100755
--- a/tools/anvil-join-anvil
+++ b/tools/anvil-join-anvil
@@ -54,6 +54,9 @@ if (not $anvil->data->{sys}{database}{connections})
 # Get the job details
 load_job($anvil);
 
+# Hold until both subnodes are marked as configured and not in maintenance mode.
+wait_for_subnodes($anvil);
+
 # Update the user passwords
 update_passwords($anvil);
 
@@ -215,9 +218,6 @@ sub configure_pacemaker
 		return(0);
 	}
 	
-	# Hold until both subnodes are marked as configured and not in maintenance mode.
-	wait_for_subnodes($anvil);
-	
 	### Run on both nodes.
 	# Enable pcsd and start the pcsd daemon.
 	my ($return_code) = $anvil->System->enable_daemon({daemon => "pcsd.service"});