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 f3f311218..d06e912eb 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_name.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_name.fxml
@@ -18,13 +18,13 @@
 	</padding>
 	<children>
 		<Region VBox.vgrow="ALWAYS"/>
-		<Label text="%addvaultwizard.new.insertName"/>
-		<TextField fx:id="textField" promptText="TODO vaultname to be" HBox.hgrow="ALWAYS"/>
+		<Label text="%addvaultwizard.new.nameInstruction"/>
+		<TextField fx:id="textField" promptText="%addvaultwizard.new.namePrompt" HBox.hgrow="ALWAYS"/>
 		<Region VBox.vgrow="ALWAYS"/>
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+X">
 			<buttons>
-				<Button text="TODO Back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back"/>
-				<Button text="TODO Next" ButtonBar.buttonData="NEXT_FORWARD" onAction="#next" defaultButton="true" disable="${controller.vaultName.empty}"/>
+				<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back"/>
+				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" onAction="#next" defaultButton="true" disable="${controller.vaultName.empty}"/>
 			</buttons>
 		</ButtonBar>
 	</children>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 5f546734a..d7e1eedfd 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -15,7 +15,8 @@ addvaultwizard.existing.filePickerButton=TODO Filepicker
 addvaultwizard.existing.instruction=Please choose the masterkey.cryptomator file of your existing vault.The path to the vault will be displayed.
 addvaultwizard.existing.filePickerTitle=Open Masterkey File
 ##New
-addvaultwizard.new.insertName=Please enter a name for the vault.
+addvaultwizard.new.nameInstruction=Please enter a name for the vault:
+addvaultwizard.new.namePrompt=TODO vault name
 addvaultwizard.new.selectLocation=Please pick a directory where your vault is stored:
 addvaultwizard.new.directoryPickerTitle=Select Directory
 addvaultwizard.new.enterPassword=Please enter a Password for your vault: