diff --git a/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml b/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml
index 98e3d5883..0f44ae0da 100644
--- a/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml
@@ -16,7 +16,7 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<Button text="%vaultOptions.general.changePasswordBtn" onAction="#changePassword" contentDisplay="LEFT">
+		<Button text="%vaultOptions.masterkey.changePasswordBtn" onAction="#changePassword" contentDisplay="LEFT">
 			<graphic>
 				<FontAwesome5IconView glyph="KEY"/>
 			</graphic>
@@ -26,7 +26,7 @@
 		
 		<Label maxWidth="-Infinity" text="%vaultOptions.masterkey.recoveryKeyExpanation" wrapText="true"/>
 		<HBox spacing="6" alignment="CENTER">
-			<Button text="%vaultOptions.general.showRecoveryKeyBtn" onAction="#showRecoveryKey" contentDisplay="LEFT">
+			<Button text="%vaultOptions.masterkey.showRecoveryKeyBtn" onAction="#showRecoveryKey" contentDisplay="LEFT">
 				<graphic>
 					<FontAwesome5IconView glyph="EYE"/>
 				</graphic>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 64edf1676..f34af901b 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -193,9 +193,9 @@ vaultOptions.mount.mountPoint.directoryPickerButton=Choose…
 vaultOptions.mount.mountPoint.directoryPickerTitle=Pick an empty directory
 ## Master Key
 vaultOptions.masterkey=Password
-vaultOptions.general.changePasswordBtn=Change Password
+vaultOptions.masterkey.changePasswordBtn=Change Password
 vaultOptions.masterkey.recoveryKeyExpanation=A recovery key is your only means to restore access to a vault, if you loose your password.
-vaultOptions.general.showRecoveryKeyBtn=Display Recovery Key
+vaultOptions.masterkey.showRecoveryKeyBtn=Display Recovery Key
 vaultOptions.masterkey.recoverPasswordBtn=Recover Password
 
 # Recovery Key