diff --git a/include/ircd/m/name.h b/include/ircd/m/name.h
index 47985c2e6..1545bc01b 100644
--- a/include/ircd/m/name.h
+++ b/include/ircd/m/name.h
@@ -115,6 +115,7 @@ namespace ircd::m::name
 	constexpr const char *const username {"username"};
 	constexpr const char *const bind_email {"bind_email"};
 	constexpr const char *const auth {"auth"};
+	constexpr const char *const inhibit_login {"inhibit_login"};
 
 	constexpr const char *const visibility {"visibility"};
 	constexpr const char *const room_alias_name {"room_alias_name"};
diff --git a/include/ircd/m/register.h b/include/ircd/m/register.h
index 37cef7d08..f605050c1 100644
--- a/include/ircd/m/register.h
+++ b/include/ircd/m/register.h
@@ -25,7 +25,8 @@ struct ircd::m::registar
 	json::property<name::bind_email, bool>,
 	json::property<name::password, string_view>,
 	json::property<name::auth, json::object>,
-	json::property<name::device_id, string_view>
+	json::property<name::device_id, string_view>,
+	json::property<name::inhibit_login, bool>
 >
 {
 	using super_type::tuple;
diff --git a/modules/client/register.cc b/modules/client/register.cc
index f6f948fe9..c5fd6f41a 100644
--- a/modules/client/register.cc
+++ b/modules/client/register.cc
@@ -121,9 +121,14 @@ try
 			"User registration for this server is disabled."
 		};
 
+	const bool &inhibit_login
+	{
+		json::get<"inhibit_login"_>(request)
+	};
+
 	const std::string response
 	{
-		register_user(request, &client, true)
+		register_user(request, &client, !inhibit_login)
 	};
 
 	// Send response to user
@@ -237,11 +242,13 @@ register_user(const m::registar &request,
 		unquote(json::get<"device_id"_>(request))
 	};
 
-	const auto device_id
+	const m::id::device::buf device_id
 	{
 		requested_device_id?
 			m::id::device::buf{requested_device_id, my_host()}:
-			m::id::device::buf{m::id::generate, my_host()}
+		gen_token?
+			m::id::device::buf{m::id::generate, my_host()}:
+			m::id::device::buf{}
 	};
 
 	// 3.3.1 If true, the server binds the email used for authentication to the