diff --git a/routes/ssh.js b/routes/ssh.js
index 4f9dd7a..b5cd5e9 100644
--- a/routes/ssh.js
+++ b/routes/ssh.js
@@ -1,5 +1,5 @@
-const user = ":user([^@]+)";
-const host = ":host([^@]+)";
+const user = ":user([^@/]+)";
+const host = ":host([^@/]+)";
 const type = ":type((dsa|rsa|ecdsa|ed25519))";
 
 let express = require("express");
@@ -7,10 +7,14 @@ let db = require("../libs/Database").instance();
 let router = express.Router();
 let userRouter = express.Router();
 
-function toList(a, b) {
+function combineToList(a, b) {
     return a + "\n" + b;
 }
 
+function toList(array) {
+    return array.reduce(combineToList, "").trim();
+}
+
 router.use(["/user", "/users", "/userKeys"], userRouter);
 
 function userReq(req, res) {
@@ -22,7 +26,7 @@ function userReq(req, res) {
     q.list((e, d) => {
         if (e) return res.status(500).render('error', {message: e.message, error: e});
         res.type("text/plain");
-        res.send(d.reduce(toList), "");
+        res.send(toList(d));
     });
 }