1 files changed, 5 insertions, 9 deletions

diff --git a/src/madc.cpp b/src/madc.cpp
index 88060e9..7d8cb81 100644
--- a/src/madc.cpp
+++ b/src/madc.cpp
@@ -95,21 +95,18 @@ int main(int argc, char *argv[]) {
     std::cerr << " connected." << std::endl << std::endl;
 
     {
-      std::string username;
-      Core::String password;
-
       std::cerr << "Login: " << std::flush;
-      std::getline(std::cin, username);
-      password = Client::PasswordReader::readPassword("Password: ");
+      Core::String username = Core::String::getline(std::cin);
+      Core::String password = Client::PasswordReader::readPassword("Password: ");
 
       try {
-        Client::Authenticators::ChallengeResponseAuthenticator::authenticate(&application, connection, username.c_str(), password);
+        Client::Authenticators::ChallengeResponseAuthenticator::authenticate(&application, connection, username, password);
       }
       catch(Core::Exception e) {
         if(e.getErrorCode() != Core::Exception::NOT_AVAILABLE)
           throw e;
 
-        Client::Authenticators::PasswordAuthenticator::authenticate(&application, connection, username.c_str(), password);
+        Client::Authenticators::PasswordAuthenticator::authenticate(&application, connection, username, password);
       }
     }
 
@@ -144,8 +141,7 @@ int main(int argc, char *argv[]) {
         commandParser.requestDisconnect();
       }
       else if(*cmd) {
-        // TODO Use locale
-        commandParser.parse(Core::String::fromUTF8(cmd));
+        commandParser.parse(Core::String::fromLocale(cmd));
         history(hist, &histEv, H_ENTER, cmd);
       }
       else continue;