diff --git a/TODO b/TODO
index 983677b1..b9557362 100644
--- a/TODO
+++ b/TODO
@@ -293,16 +293,6 @@ Wireless daemon
   Priority: High
   Complexity: C4
 
-- Implement agent support in iwd.
-
-  If something needs to be asked from user, like passphrase etc.
-  a DBus agent interface can be registered by the user.
-  This is similar as what is implemented in ConnMan and BlueZ.
-
-  Priority: Medium
-  Complexity: C2
-  Owner: Jukka Rissanen <jukka.rissanen@linux.intel.com>
-
 - Add utility to create netlink REKEY_DATA attributes
 
   The REKEY_DATA needs to be uploaded to the driver so that if re-keying is
diff --git a/doc/features.txt b/doc/features.txt
index 10338833..159b56ae 100644
--- a/doc/features.txt
+++ b/doc/features.txt
@@ -14,6 +14,13 @@ a certain SSID instead of connecting directly to a BSS. IWD will then pick
 the best BSS automatically from the BSS list when connecting to a SSID.
 The "best" BSS in this context is the BSS that has the highest signal strength.
 
+IWD uses the DBus agent interface to query information from the user.
+The information asked include things like passphrase etc. The user can
+register only one agent to iwd. If the user does not respond in timely
+manner to the query, then the pending user request is cancelled after a
+timeout. The pending user request is also cancelled if user disconnects a
+pending connection attempt.
+
 
 Wireless monitor
 ================