diff --git a/main/ui/src/main/resources/fxml/addvault_existing.fxml b/main/ui/src/main/resources/fxml/addvault_existing.fxml
index fea6a2d8b..bf78ab703 100644
--- a/main/ui/src/main/resources/fxml/addvault_existing.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_existing.fxml
@@ -17,12 +17,12 @@
 	</padding>
 	<children>
 		<Region VBox.vgrow="ALWAYS"/>
-		<Label text="%addvaultwizard.existing.instruction"/>
+		<Label text="%addvaultwizard.existing.instruction" labelFor="$finishButton"/>
 		<Region VBox.vgrow="ALWAYS"/>
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+I">
 			<buttons>
 				<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back"/>
-				<Button text="Choose..." ButtonBar.buttonData="FINISH" onAction="#chooseFileAndFinish" defaultButton="true"/>
+				<Button fx:id="finishButton" text="Choose..." ButtonBar.buttonData="FINISH" onAction="#chooseFileAndFinish" defaultButton="true"/>
 			</buttons>
 		</ButtonBar>
 	</children>
diff --git a/main/ui/src/main/resources/fxml/addvault_new_name.fxml b/main/ui/src/main/resources/fxml/addvault_new_name.fxml
index d06e912eb..8eb3cc4db 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_name.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_name.fxml
@@ -18,7 +18,7 @@
 	</padding>
 	<children>
 		<Region VBox.vgrow="ALWAYS"/>
-		<Label text="%addvaultwizard.new.nameInstruction"/>
+		<Label text="%addvaultwizard.new.nameInstruction" labelFor="$textField"/>
 		<TextField fx:id="textField" promptText="%addvaultwizard.new.namePrompt" HBox.hgrow="ALWAYS"/>
 		<Region VBox.vgrow="ALWAYS"/>
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+X">
diff --git a/main/ui/src/main/resources/fxml/addvault_new_password.fxml b/main/ui/src/main/resources/fxml/addvault_new_password.fxml
index 74beca80f..81515b5e6 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_password.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_password.fxml
@@ -20,7 +20,7 @@
 	</padding>
 	<children>
 		<Region VBox.vgrow="ALWAYS"/>
-		<Label text="%addvaultwizard.new.enterPassword"/>
+		<Label text="%addvaultwizard.new.enterPassword" labelFor="$passwordField"/>
 		<SecPasswordField fx:id="passwordField"/>
 		<HBox spacing="6.0" prefHeight="6.0" cacheShape="true" cache="true">
 			<Region HBox.hgrow="ALWAYS" fx:id="passwordStrengthLevel0" cacheShape="true" cache="true" />
@@ -29,9 +29,9 @@
 			<Region HBox.hgrow="ALWAYS" fx:id="passwordStrengthLevel3" cacheShape="true" cache="true" />
 			<Region HBox.hgrow="ALWAYS" fx:id="passwordStrengthLevel4" cacheShape="true" cache="true" />
 		</HBox>
-		<Label fx:id="passwordStrengthLabel" styleClass="caption-label" />
+		<Label fx:id="passwordStrengthLabel" styleClass="caption-label" labelFor="$passwordField" />
 		<Region VBox.vgrow="ALWAYS"/>
-		<Label text="%addvaultwizard.new.reenterPassword"/>
+		<Label text="%addvaultwizard.new.reenterPassword" labelFor="$reenterField"/>
 		<SecPasswordField fx:id="reenterField"/>
 		<HBox fx:id="passwordMatchBox" spacing="12.0" alignment="BASELINE_RIGHT" >
 			<!-- TODO
@@ -40,7 +40,7 @@
 			-->
 			<Rectangle fx:id="checkmark" width="10" height="10" fill="green"/>
 			<Rectangle fx:id="cross" width="10" height="10" fill="red"/>
-			<Label fx:id="passwordMatchLabel" />
+			<Label fx:id="passwordMatchLabel" labelFor="$reenterField" />
 		</HBox>
 		<Region VBox.vgrow="ALWAYS"/>
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+I">