diff --git a/src/qml/Pages/AddChat/CreateRoom.qml b/src/qml/Pages/AddChat/CreateRoom.qml
index d450053a..fe6ba15d 100644
--- a/src/qml/Pages/AddChat/CreateRoom.qml
+++ b/src/qml/Pages/AddChat/CreateRoom.qml
@@ -16,7 +16,8 @@ HBox {
 
     buttonCallbacks: ({
         apply: button => {
-            button.loading = true
+            button.loading    = true
+            errorMessage.text = ""
 
             let args = [
                 nameField.text || null,
diff --git a/src/qml/Pages/AddChat/JoinRoom.qml b/src/qml/Pages/AddChat/JoinRoom.qml
index 6176eab7..2b664e6b 100644
--- a/src/qml/Pages/AddChat/JoinRoom.qml
+++ b/src/qml/Pages/AddChat/JoinRoom.qml
@@ -17,7 +17,8 @@ HBox {
 
     buttonCallbacks: ({
         apply: button => {
-            button.loading = true
+            button.loading    = true
+            errorMessage.text = ""
 
             let args = [roomField.text]
 
diff --git a/src/qml/Pages/SignIn.qml b/src/qml/Pages/SignIn.qml
index ffa7960a..84b28588 100644
--- a/src/qml/Pages/SignIn.qml
+++ b/src/qml/Pages/SignIn.qml
@@ -26,7 +26,9 @@ HPage {
             register: button => {},
 
             login: button => {
-                button.loading = true
+                button.loading    = true
+                errorMessage.text = ""
+
                 let args = [
                     idField.text, passwordField.text,
                     undefined, serverField.text,
@@ -35,7 +37,7 @@ HPage {
                 py.callCoro("login_client", args, ([success, data]) => {
                     if (! success) {
                         errorMessage.text = qsTr(data)
-                        button.loading = false
+                        button.loading    = false
                         return
                     }
 
diff --git a/src/qml/Popups/PasswordPopup.qml b/src/qml/Popups/PasswordPopup.qml
index 108a67b9..bc7cf1b3 100644
--- a/src/qml/Popups/PasswordPopup.qml
+++ b/src/qml/Popups/PasswordPopup.qml
@@ -33,9 +33,10 @@ BoxPopup {
 
     box.buttonCallbacks: ({
         ok: button => {
-            let password   = passwordField.text
-            okClicked      = true
-            button.loading = true
+            let password      = passwordField.text
+            okClicked         = true
+            button.loading    = true
+            errorMessage.text = ""
 
             verifyPassword(password, result => {
                 if (result === true) {