diff --git a/components/buffer.js b/components/buffer.js
index 8f2e30e..310654f 100644
--- a/components/buffer.js
+++ b/components/buffer.js
@@ -230,7 +230,7 @@ class LogLine extends Component {
 			if (irc.isError(msg.command) && msg.command != irc.ERR_NOMOTD) {
 				lineClass = "error";
 			}
-			content = html`${msg.command} ${msg.params.join(" ")}`;
+			content = html`${msg.command} ${linkify(msg.params.join(" "))}`;
 		}
 
 		return html`
diff --git a/components/connect-form.js b/components/connect-form.js
index 5ebd382..0cf52a1 100644
--- a/components/connect-form.js
+++ b/components/connect-form.js
@@ -1,4 +1,5 @@
 import { html, Component, createRef } from "../lib/index.js";
+import linkify from "../lib/linkify.js";
 
 export default class ConnectForm extends Component {
 	state = {
@@ -104,7 +105,7 @@ export default class ConnectForm extends Component {
 			`;
 		} else if (this.props.error) {
 			status = html`
-				<p class="error-text">${this.props.error}</p>
+				<p class="error-text">${linkify(this.props.error)}</p>
 			`;
 		}