diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index a77c036759f35c54b753bd3a6c642d5b4ac0fb08..bb339305cec290bc030fac4d2896d17e38641226 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -460,7 +460,7 @@ void LLLoginInstance::handleLoginFailure(const LLSD& event)
             gViewerWindow->setShowProgress(FALSE);
         }
 
-        LLSD args(llsd::map( "MESSAGE", LLTrans::getString(response["message_id"]) ));
+        LLSD args(llsd::map( "MESSAGE", LLTrans::getString(response["message_id"].asString()) ));
         LLSD payload;
         LLNotificationsUtil::add("PromptMFAToken", args, payload, [=](LLSD const & notif, LLSD const & response) {
             bool continue_clicked = response["continue"].asBoolean();
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index f144d8d5e0bc3974e4339f97e0fe69e5920b29ec..4327352915d63c9080640f29bd5148de44bc8528 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -197,7 +197,7 @@ std::string LLGridManager::getAppSLURLBase(const std::string& grid_name) const
 {
 	return "myappslurl";
 }
-std::string LLGridManager::getGridId(const std::string& grid)
+std::string LLGridManager::getGridId(const std::string& grid) const
 {
     return std::string();
 }