diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index be7b4c1e3..f562ef89b 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1708,6 +1708,9 @@
   "typeInOldPassword": {
     "message": "Please type in your old password"
   },
+  "invalidOldPassword": {
+    "message": "Old password is invalid"
+  },
   "invalidPassword": {
     "message": "Invalid password"
   },
diff --git a/main.js b/main.js
index 50e4f2b26..abbb8b418 100644
--- a/main.js
+++ b/main.js
@@ -959,7 +959,8 @@ ipc.on('password-window-login', async (event, passPhrase) => {
       passwordWindow = null;
     }
   } catch (e) {
-    sendResponse('Invalid password');
+    const localisedError = locale.messages.invalidPassword.message;
+    sendResponse(localisedError || 'Invalid password');
   }
 });
 
@@ -971,7 +972,8 @@ ipc.on('set-password', async (event, passPhrase, oldPhrase) => {
     const hash = await sql.getPasswordHash();
     const hashMatches = oldPhrase && passwordUtil.matchesHash(oldPhrase, hash);
     if (hash && !hashMatches) {
-      sendResponse('Failed to set password: Old password provided is invalid');
+      const incorrectOldPassword = locale.messages.invalidOldPassword.message;
+      sendResponse(incorrectOldPassword || 'Failed to set password: Old password provided is invalid');
       return;
     }
 
@@ -987,7 +989,8 @@ ipc.on('set-password', async (event, passPhrase, oldPhrase) => {
 
     sendResponse();
   } catch (e) {
-    sendResponse('Failed to set password');
+    const localisedError = locale.messages.setPasswordFail.message;
+    sendResponse(localisedError || 'Failed to set password');
   }
 });