diff --git a/assets/client.js b/assets/client.js
index a3d87e8..19b62ca 100644
--- a/assets/client.js
+++ b/assets/client.js
@@ -330,6 +330,19 @@ function setConnectFormDisabled(disabled) {
 	});
 }
 
+function parseQueryString() {
+	var query = window.location.search.substring(1);
+	var params = {};
+	query.split('&').forEach(function(s) {
+		if (!s) {
+			return;
+		}
+		var pair = s.split('=');
+		params[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || "");
+	});
+	return params;
+}
+
 connectFormElt.onsubmit = function(event) {
 	event.preventDefault();
 	setConnectFormDisabled(true);
@@ -374,4 +387,10 @@ if (localStorage && localStorage.getItem("server")) {
 	connectFormElt.elements["remember-me"].checked = true;
 	setConnectFormDisabled(true);
 	connect();
+} else {
+	var params = parseQueryString();
+	if (params.server) {
+		connectFormElt.elements.url.value = params.server;
+		document.querySelector("#connect-url-container").style.display = "none";
+	}
 }
diff --git a/index.html b/index.html
index 0a39835..6cbd6ce 100644
--- a/index.html
+++ b/index.html
@@ -26,9 +26,11 @@
 			<form>
 				<h2>Connect to IRC</h2>
 
-				<label for="connect-url">Server URL:</label><br/>
-				<input type="url" name="url" id="connect-url" value="ws://localhost:8080"/>
-				<br/><br/>
+				<div id="connect-url-container">
+					<label for="connect-url">Server URL:</label><br/>
+					<input type="url" name="url" id="connect-url" value="ws://localhost:8080"/>
+					<br/><br/>
+				</div>
 
 				<label for="connect-nick">Nickname:</label><br/>
 				<input type="username" name="nick" id="connect-nick" autofocus required/>
@@ -43,7 +45,7 @@
 				<br/><br/>
 
 				<details>
-					<summary>More options</summary>
+					<summary>Advanced options</summary>
 
 					<br/>