diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a6ad4c2..a4498f59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,9 @@ and this project adheres to
   and build files before regenerating the Makefile and installing:
   `sudo make uninstall; make clean; qmake && make && sudo make install`
 
+- Improve the error messages shown when trying to start a direct chat with or 
+  invite a non-existing user
+
 ### Removed
 
 - Removed delay when multiple rooms are removed/hidden from the list.
@@ -53,9 +56,6 @@ and this project adheres to
 - Fix Python pickling error when trying to redecrypt events after importing
   E2E keys ([#50](https://github.com/mirukana/mirage/issues/50))
 
-- Fix the error message shown when trying to start a direct chat with or 
-  invite a non-existing user
-
 - Handle Matrix 502 errors returned when trying to start a direct chat or 
   invite a user with an incorrect or unresponsive server in their ID
 
diff --git a/src/gui/Pages/AddChat/DirectChat.qml b/src/gui/Pages/AddChat/DirectChat.qml
index 7d4c9152..e631df9d 100644
--- a/src/gui/Pages/AddChat/DirectChat.qml
+++ b/src/gui/Pages/AddChat/DirectChat.qml
@@ -45,12 +45,12 @@ HBox {
                                "@username:homeserver")
 
                 if (type === "MatrixNotFound")
-                    txt = qsTr("This user does not exist")
+                    txt = qsTr("User not found, please verify the entered ID")
 
                 if (type === "MatrixBadGateway")
                     txt = qsTr(
-                        "Server error while trying to find user, please " +
-                        "verify the entered user ID"
+                        "Could not contact this user's server, " +
+                        "please verify the entered ID"
                     )
 
                 errorMessage.text = txt
diff --git a/src/gui/Popups/InviteToRoomPopup.qml b/src/gui/Popups/InviteToRoomPopup.qml
index 639159d5..bac68a13 100644
--- a/src/gui/Popups/InviteToRoomPopup.qml
+++ b/src/gui/Popups/InviteToRoomPopup.qml
@@ -105,12 +105,12 @@ BoxPopup {
                          "servers, can't invite %1").arg(user) :
 
                     type === "MatrixNotFound" ?
-                    qsTr("%1 not found, please verify the entered user ID")
+                    qsTr("%1 not found, please verify the entered ID")
                     .arg(user) :
 
                     type === "MatrixBadGateway" ?
-                    qsTr("Server error while trying to find %1, please " +
-                         "verify the entered user ID").arg(user) :
+                    qsTr("Could not contact %1's server, " +
+                         "please verify the entered ID").arg(user) :
 
                     type === "MatrixUnsupportedRoomVersion" ?
                     qsTr("%1's server does not support this room's version")