diff --git a/rai/qt/qt.cpp b/rai/qt/qt.cpp
index 90e08cf2..d489997c 100755
--- a/rai/qt/qt.cpp
+++ b/rai/qt/qt.cpp
@@ -1158,6 +1158,16 @@ wallet (wallet_a)
                 }
             }
         }
+		else
+		{
+			show_button_error (*change);
+			change->setText ("Wallet is locked, unlock it");
+			this->wallet.node.alarm.add (std::chrono::system_clock::now () + std::chrono::seconds (5), [this] ()
+			{
+				show_button_ok (*change);
+				change->setText ("Set/Change password");
+			});
+		}
     });
 	QObject::connect (change_rep, &QPushButton::released, [this] ()
 	{
@@ -1217,6 +1227,18 @@ wallet (wallet_a)
 		{
 			password->clear ();
 		}
+		else
+		{
+			show_line_error (*password);
+			show_button_error (*unlock);
+			unlock->setText ("Invalid password");
+			this->wallet.node.alarm.add (std::chrono::system_clock::now () + std::chrono::seconds (5), [this] ()
+			{
+				show_line_ok (*password);
+				show_button_ok (*unlock);
+				unlock->setText ("Unlock");
+			});
+		}
     });
     QObject::connect (lock, &QPushButton::released, [this] ()
     {