diff --git a/src/app.cpp b/src/app.cpp
index 1a100f6..40c2f0f 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -568,6 +568,8 @@ void App::renderChatLines(Wt::Json::Object conversation, Wt::WContainerWidget* o
             std::cout << e.what() << std::endl;
         }
     }
+    doJavaScript(outputContainer->jsRef() + ".scrollTop += "
+                 + outputContainer->jsRef() + ".scrollHeight;");
 }
 
 void App::renderChatLine(Wt::Json::Object &line, Wt::Json::Object conversation, Wt::WContainerWidget* outputContainer) {
@@ -1070,7 +1072,7 @@ void App::addTimeoutView() {
         remainingTimeStream << std::setw(2) << std::setfill('0') << minutes << ":"
                           << std::setw(2) << std::setfill('0') << seconds << " m";
         std::string elapsedTimeString = remainingTimeStream.str();
-        timeoutRemainingWidget->setText(Wt::WString("Remaining time before logout is {1}").arg(elapsedTimeString));
+        timeoutRemainingWidget->setText(Wt::WString("Timeout in {1}").arg(elapsedTimeString));
     };
     timeoutRemainingTimer_->timeout().connect(timeoutRemainingRefresh);
     timeoutRemainingRefresh();