diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/types/logintypes.go b/src/github.com/matrix-org/dendrite/clientapi/auth/types/logintypes.go
index cedb128e7..42cb477af 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/auth/types/logintypes.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/auth/types/logintypes.go
@@ -5,7 +5,5 @@ type LoginType string
 
 // The relevant login types implemented in Dendrite
 const (
-	LoginTypeDummy     = "m.login.dummy"
-	LoginTypeRecaptcha = "m.login.recaptcha"
-	LoginTypePassword  = "m.login.password"
+	LoginTypeDummy = "m.login.dummy"
 )
diff --git a/src/github.com/matrix-org/dendrite/clientapi/writers/register.go b/src/github.com/matrix-org/dendrite/clientapi/writers/register.go
index 969f666b9..773865497 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/writers/register.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/writers/register.go
@@ -29,6 +29,7 @@ type registerRequest struct {
 type authDict struct {
 	Type    types.LoginType `json:"type"`
 	Session string          `json:"session"`
+	// TODO: Lots of custom keys depending on the type
 }
 
 // http://matrix.org/speculator/spec/HEAD/client_server/unstable.html#user-interactive-authentication-api
@@ -106,7 +107,8 @@ func Register(req *http.Request, accountDB *storage.AccountDatabase) util.JSONRe
 	if r.Auth.Type == "" {
 		return util.JSONResponse{
 			Code: 401,
-			// Hard-coded 'dummy' auth for now with a bogus session ID.
+			// TODO: Hard-coded 'dummy' auth for now with a bogus session ID.
+			//       Server admins should be able to change things around (eg enable captcha)
 			JSON: newUserInteractiveResponse("totallyuniquesessionid", []flow{
 				flow{[]types.LoginType{types.LoginTypeDummy}},
 			}),