diff --git a/agent/src/cli/client.rs b/agent/src/cli/client.rs
index 22629287..b2e9a606 100644
--- a/agent/src/cli/client.rs
+++ b/agent/src/cli/client.rs
@@ -174,7 +174,7 @@ impl Client<'_> {
         0
     }
 
-    pub fn ping(&self) -> i32 {
+    pub fn ping(&self) -> (String, String) {
         // start duration measure
         let start = Instant::now();
         let sess = self.create_session(None).unwrap();
@@ -187,16 +187,13 @@ impl Client<'_> {
 
         let result = ch.exit_status().unwrap();
         if result != 0 {
-            return result;
+            return ("?".to_string(), "?".to_string());
         }
 
-        println!(
-            "{:.2}ms / {:.2}ms",
-            dur_sess.as_millis(),
-            dur_exec.as_millis()
-        );
-
-        0
+        (
+            format!("{:.2}", dur_sess.as_millis()),
+            format!("{:.2}", dur_exec.as_millis()),
+        )
     }
 
     pub async fn remote_do_copy_async(
diff --git a/agent/src/cli/command.rs b/agent/src/cli/command.rs
index 7d807d3f..b67e9a68 100644
--- a/agent/src/cli/command.rs
+++ b/agent/src/cli/command.rs
@@ -130,7 +130,12 @@ pub fn command_get_remote_version(client: Client, _: Option<Vec<String>>) {
 }
 
 pub fn command_ping(client: Client, _: Option<Vec<String>>) {
-    client.ping();
+    let (connect, exec) = client.ping();
+
+    println!(
+        "{{\"connect\": \"{}ms\", \"exec\": \"{}ms\"}}",
+        connect, exec
+    );
 }
 
 pub fn command_get_local_version(client: Client, _: Option<Vec<String>>) {
diff --git a/agent/src/web/miscellaneous.rs b/agent/src/web/miscellaneous.rs
index 2ba9df5d..a33e8961 100644
--- a/agent/src/web/miscellaneous.rs
+++ b/agent/src/web/miscellaneous.rs
@@ -18,7 +18,7 @@ use crate::{
 pub struct VersionResponse {
     version: Option<Version>,
     error: Option<String>,
-    latency: Option<String>,
+    latency: Option<Latency>,
 }
 
 #[derive(Deserialize, Serialize, Debug)]
@@ -27,6 +27,12 @@ pub struct Version {
     agent: String,
 }
 
+#[derive(Deserialize, Serialize, Debug)]
+pub struct Latency {
+    connect: String,
+    exec: String,
+}
+
 #[derive(Serialize, Debug)]
 pub struct PingResponse {
     latency: Option<String>,
@@ -71,7 +77,7 @@ pub async fn version(
     let ping_args: Vec<&str> = vec![&agent.host, &agent.port];
 
     // execute 'ping' command
-    let ping = match run_command_async(91, true, false, COMMAND_PING, ping_args).await {
+    let ping_str = match run_command_async(91, true, false, COMMAND_PING, ping_args).await {
         Ok(ping) => ping,
         Err(err) => {
             return Json(VersionResponse {
@@ -97,8 +103,23 @@ pub async fn version(
     }
     let version: Version = deserialized_result.unwrap();
 
+    // parse ping json result
+    let deserialized_result = serde_json::from_str(&ping_str);
+    if deserialized_result.is_err() {
+        return Json(VersionResponse {
+            version: None,
+            latency: None,
+            error: Some(format!(
+                "parse error: {} -- {}",
+                deserialized_result.unwrap_err(),
+                version_str
+            )),
+        });
+    }
+    let latency: Latency = deserialized_result.unwrap();
+
     Json(VersionResponse {
-        latency: Some(ping.trim().to_string()),
+        latency: Some(latency),
         version: Some(version),
         error: None,
     })
diff --git a/backend/agents/client.go b/backend/agents/client.go
index 0dba45a7..a360fccd 100644
--- a/backend/agents/client.go
+++ b/backend/agents/client.go
@@ -52,7 +52,7 @@ type GetTokenUserResponse struct {
 }
 
 type GetVersionResponse struct {
-	Latency string  `json:"latency"`
+	Latency Latency `json:"latency"`
 	Version Version `json:"version"`
 	Error   string  `json:"error"`
 }
@@ -62,6 +62,11 @@ type Version struct {
 	Files string `json:"files"`
 }
 
+type Latency struct {
+	Connect string `json:"connect"`
+	Exec    string `json:"exec"`
+}
+
 type GetResourceResponse struct {
 	Resource string `json:"resource"`
 	Error    string `json:"error"`
@@ -378,6 +383,10 @@ func (c *AgentClient) GetVersion(token string) GetVersionResponse {
 		Agent: "unknown",
 		Files: "unknown",
 	}
+	returnLatency := Latency{
+		Connect: "?",
+		Exec:    "?",
+	}
 	returnError := ""
 
 	r, err := nethttps.NewRequest("GET", requestURL, nethttps.NoBody)
@@ -406,11 +415,12 @@ func (c *AgentClient) GetVersion(token string) GetVersionResponse {
 		returnError = resp.Error
 	} else {
 		returnVersion = resp.Version
+		returnLatency = resp.Latency
 	}
 
 	return GetVersionResponse{
 		Version: returnVersion,
 		Error:   returnError,
-		Latency: resp.Latency,
+		Latency: returnLatency,
 	}
 }
diff --git a/backend/http/agents.go b/backend/http/agents.go
index 6a228fb7..9b035106 100644
--- a/backend/http/agents.go
+++ b/backend/http/agents.go
@@ -297,6 +297,7 @@ var agentPutHandler = injectAgentWithUser(func(w http.ResponseWriter, r *http.Re
 		return http.StatusInternalServerError, err
 	}
 
+	w.Header().Set("Location", "/settings/agents")
 	return http.StatusOK, nil
 })
 
diff --git a/frontend/src/api/agents.js b/frontend/src/api/agents.js
index d7097e5f..b768eacb 100644
--- a/frontend/src/api/agents.js
+++ b/frontend/src/api/agents.js
@@ -24,7 +24,7 @@ export async function create(agent) {
 }
 
 export async function update(agent, which = ["all"]) {
-  await fetchURL(`/api/agents/${agent.id}`, {
+  const res = await fetchURL(`/api/agents/${agent.id}`, {
     method: "PUT",
     body: JSON.stringify({
       what: "agent",
@@ -32,6 +32,10 @@ export async function update(agent, which = ["all"]) {
       data: agent,
     }),
   });
+
+  if (res.status === 200) {
+    return res.headers.get("Location");
+  }
 }
 
 export async function remoteUserLogin(agentID, name, password) {
diff --git a/frontend/src/views/settings/Agent.vue b/frontend/src/views/settings/Agent.vue
index 9da17c73..95c9a9dd 100644
--- a/frontend/src/views/settings/Agent.vue
+++ b/frontend/src/views/settings/Agent.vue
@@ -2,7 +2,7 @@
   <errors v-if="error" :errorCode="error.status" />
   <div class="row" v-else-if="!loading">
     <div class="column">
-      <form ref="form" class="card">
+      <form ref="form" @keypress.prevent.enter="submit" class="card">
         <div class="card-title">
           <h2 v-if="agent.id === 0">
             {{ $t("settings.agent.newConnection") }}
@@ -27,6 +27,7 @@
           </button>
           <button
             v-if="!isNew"
+            ref="submit"
             @click="save"
             type="button"
             class="button button--flat"
@@ -37,6 +38,7 @@
           </button>
           <stateful-button
             v-if="isNew"
+            ref="submit"
             :handler="save"
             class-name="button button--flat"
             label-tr="buttons.connectAndSave"
@@ -143,6 +145,11 @@ export default {
           : this.$showError(e);
       }
     },
+    submit(event) {
+      const submit = this.$refs.submit;
+      submit && submit.$el && submit.$el.click(event);
+      submit && submit.click && submit.click(event);
+    },
     async save(event) {
       event.preventDefault();
       let agent = {
@@ -151,15 +158,12 @@ export default {
       };
 
       try {
-        if (this.isNew) {
-          const loc = await api.create(agent);
-          this.$router.push({ path: loc });
-          this.$showSuccess(this.$t("settings.agent.connectionCreated"));
-        } else {
-          await api.update(agent, ["branding"]);
-
-          this.$showSuccess(this.$t("settings.agent.connectionUpdated"));
-        }
+        const params = this.isNew ? null : ["branding"];
+        const method = this.isNew ? "create" : "update";
+        const message = this.isNew ? "Created" : "Updated";
+        const loc = await api[method](agent, params);
+        this.$showSuccess(this.$t(`settings.agent.connection${message}`));
+        await this.$router.push({ path: loc });
       } catch (e) {
         this.$showError(e);
       }
diff --git a/frontend/src/views/settings/Agents.vue b/frontend/src/views/settings/Agents.vue
index 83135ddc..684c531b 100644
--- a/frontend/src/views/settings/Agents.vue
+++ b/frontend/src/views/settings/Agents.vue
@@ -86,7 +86,7 @@
               <th></th>
             </tr>
 
-            <tr v-for="agent in agents" :key="agent.id">
+            <tr v-for="(agent, index) in agents" :key="agent.id">
               <td class="status">
                 <div :class="'status-' + (agent.status || 'loading')">
                   <i v-if="agent.status === 'online'" class="material-icons">
@@ -106,14 +106,30 @@
               <td>{{ agent.port }}</td>
               <td>{{ agent.remote_user.name }}</td>
               <td v-if="!agent.error" class="version">
-                <span v-if="typeof agent.version === 'object'">
-                  {{ agent.version.files }} ({{ agent.version.agent }})
+                <span
+                  v-if="typeof agent.version === 'object'"
+                  @click="expandVersion(agent, index)"
+                >
+                  {{ agent.version.files }}
+                  <span v-if="agent.expandVersion === true">
+                    ({{ agent.version.agent }})
+                  </span>
                 </span>
               </td>
               <td v-else class="version" :colspan="agent.error ? '2' : ''">
                 <div class="error">{{ agent.error }}</div>
               </td>
-              <td v-if="!agent.error">{{ agent.latency }}</td>
+              <td v-if="!agent.error">
+                <span
+                  v-if="typeof agent.latency === 'object'"
+                  @click="expandLatency(agent, index)"
+                >
+                  {{ agent.latency.connect }}
+                  <span v-if="agent.expandLatency === true">
+                    ({{ agent.latency.exec }})
+                  </span>
+                </span>
+              </td>
               <td class="small">
                 <router-link :to="'/settings/agents/' + agent.id"
                   ><i class="material-icons">mode_edit</i></router-link
@@ -177,6 +193,8 @@ export default {
           a.latency = v.latency;
           a.version = v.version;
           a.status = "online";
+          a.expandVersion = false;
+          a.expandLatency = false;
           if (v.error) {
             a.error = v.error;
             a.status = "error";
@@ -195,6 +213,14 @@ export default {
         this.tokensCopied.push(false);
       });
     },
+    expandVersion(agent, index) {
+      agent.expandVersion = !agent.expandVersion;
+      this.agents.splice(index, 1, agent);
+    },
+    expandLatency(agent, index) {
+      agent.expandLatency = !agent.expandLatency;
+      this.agents.splice(index, 1, agent);
+    },
     copy(event) {
       const id = parseInt(event.target.dataset.id);
       this.$refs.token[id].select();