diff --git a/TODO.txt b/TODO.txt
index b05874f..e12c2aa 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -15,6 +15,9 @@ Milestone: v0.1.1
 [ ] Abstract /email/requestToken and /msidsn/requestToken
 
 [ ] User registration
+    [ ] Username validation
+    [ ] Password validation
+    [ ] Password hashing
 
 Milestone: v1.0.0
 -----------------
diff --git a/src/Matrix.c b/src/Matrix.c
index f0f8c85..e365f53 100644
--- a/src/Matrix.c
+++ b/src/Matrix.c
@@ -459,5 +459,7 @@ HashMap *
 MatrixRateLimit(HttpServerContext *context, Db *db)
 {
     /* TODO: Implement rate limiting */
+    (void) context;
+    (void) db;
     return NULL;
 }
diff --git a/src/Routes/RouteRegister.c b/src/Routes/RouteRegister.c
index a6630f1..09ad4d7 100644
--- a/src/Routes/RouteRegister.c
+++ b/src/Routes/RouteRegister.c
@@ -37,6 +37,15 @@ ROUTE_IMPL(RouteRegister, args)
 
     char *pathPart = NULL;
 
+    JsonValue *val;
+
+    char *username = NULL;
+    char *password = NULL;
+    char *initialDeviceDisplayName = NULL;
+    int refreshToken = 0;
+    int inhibitLogin = 0;
+    char *deviceId;
+
     if (MATRIX_PATH_PARTS(args->path) == 0)
     {
         if (HttpRequestMethodGet(args->context) != HTTP_POST)
@@ -59,12 +68,48 @@ ROUTE_IMPL(RouteRegister, args)
             goto finish;
         }
 
-        response = MatrixUserInteractiveAuth(args->context, args->matrixArgs->db, request);
+        response = MatrixUserInteractiveAuth(args->context,
+            args->matrixArgs->db, request);
+
         if (response)
         {
             goto finish;
         }
 
+        val = HashMapGet(request, "username");
+        if (!val)
+        {
+            HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+            response = MatrixErrorCreate(M_MISSING_PARAM);
+            goto finish;
+        }
+
+        if (JsonValueType(val) != JSON_STRING)
+        {
+            HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+            response = MatrixErrorCreate(M_BAD_JSON);
+            goto finish;
+        }
+
+        username = JsonValueAsString(val);
+
+        val = HashMapGet(request, "password");
+        if (!val)
+        {
+            HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+            response = MatrixErrorCreate(M_MISSING_PARAM);
+            goto finish;
+        }
+
+        if (JsonValueType(val) != JSON_STRING)
+        {
+            HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
+            response = MatrixErrorCreate(M_BAD_JSON);
+            goto finish;
+        }
+
+        password = JsonValueAsString(val);
+
         /* TODO: Register new user here */
 
 finish:
@@ -77,7 +122,7 @@ finish:
         if (HttpRequestMethodGet(args->context) == HTTP_GET &&
             MATRIX_PATH_EQUALS(pathPart, "available"))
         {
-            char *username = HashMapGet(
+            username = HashMapGet(
                         HttpRequestParams(args->context), "username");
 
             if (!username)