diff --git a/assets/client.js b/assets/client.js
index f041242..6e17e80 100644
--- a/assets/client.js
+++ b/assets/client.js
@@ -225,6 +225,13 @@ function connect() {
 			var channel = msg.params[0];
 			createBuffer(channel).addMessage(msg);
 			break;
+		case "NICK":
+			var newNick = msg.params[0];
+			if (msg.prefix.name == server.nick) {
+				server.nick = newNick;
+			}
+			// TODO: append message to all buffers the user is a member of
+			break;
 		default:
 			serverBuffer.addMessage(msg);
 		}
diff --git a/index.html b/index.html
index e1a1556..3e4ddb0 100644
--- a/index.html
+++ b/index.html
@@ -26,7 +26,7 @@
 			<form>
 				<h2>Connect to IRC</h2>
 
-				<label for="connect-url">URL:</label><br/>
+				<label for="connect-url">Server URL:</label><br/>
 				<input type="url" name="url" id="connect-url" value="ws://localhost:8080"/>
 				<br/><br/>