diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index 6dd6aaf9e0..d6a6781373 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -1134,7 +1134,7 @@ void CMainFrame::OnConnectError(CMainFrameEvent&) {
 
     ::wxMessageBox(
         _("Connection failed."),
-        _("Connection failed."),
+        _("BOINC Manager - Connection failed."),
         wxICON_ERROR
     );
 
@@ -1147,7 +1147,7 @@ void CMainFrame::OnConnectErrorAuthentication(CMainFrameEvent&) {
 
     ::wxMessageBox(
         _("The password you have provided is incorrect, please try again."),
-        _("Connection Error"),
+        _("BOINC Manager - Connection Error"),
         wxICON_ERROR
     );
 
diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C
index 8282c2f3e7..363b8fe6d8 100644
--- a/lib/gui_rpc_client.C
+++ b/lib/gui_rpc_client.C
@@ -1043,7 +1043,7 @@ int RPC_CLIENT::init_poll() {
             fprintf(stderr, "init_poll: get_socket_error(): %d\n", retval);
         }
     }
-    if (retval || time(0) > (connect_timestamp + 30)) {
+    if (retval || time(0) > (connect_timestamp + 60)) {
         if (tried_alt_port) {
             fprintf(stderr, "already tried both ports, giving up\n");
             return retval;