Merge pull request #1441

0fb5dc87 monero-wallet-cli wording changes 'n' stuff (luigi1111)

2 files changed, 4 insertions, 4 deletions

diff --git a/src/wallet/password_container.cpp b/src/wallet/password_container.cpp
index 480d132e7..5260bbc8b 100644
--- a/src/wallet/password_container.cpp
+++ b/src/wallet/password_container.cpp
@@ -144,19 +144,19 @@ bool password_container::read_from_tty_double_check(const char *message) {
     std::string pass2;
     bool match=false;
     bool doNotVerifyEntry=false;
+    if (m_verify){message = "Enter a password for your new wallet";}
     do{
         if (message)
             std::cout << message <<": ";
         if (!password_container::read_from_tty(pass1))
             return false;
         if (m_verify==true){//double check password; 
-            if (message)
-                std::cout << message << ": ";
+            std::cout << "Confirm Password: ";
             if (!password_container::read_from_tty(pass2))
                 return false;
             if(pass1!=pass2){ //new password entered did not match
 
-                std::cout << "Passwords do not match" << std::endl;
+                std::cout << "Passwords do not match! Please try again." << std::endl;
                 pass1="";
                 pass2="";
                 match=false;
diff --git a/src/wallet/password_container.h b/src/wallet/password_container.h
index 62f43aa37..866d170f2 100644
--- a/src/wallet/password_container.h
+++ b/src/wallet/password_container.h
@@ -48,7 +48,7 @@ namespace tools
     bool empty() const { return m_empty; }
     const std::string& password() const { return m_password; }
     void password(std::string&& val) { m_password = std::move(val); m_empty = false; }
-    bool read_password(const char *message = "password");
+    bool read_password(const char *message = "Password");
 
   private:
     //delete constructor with no parameters