diff --git a/TODO b/TODO
index 13bffbc0..ad907045 100644
--- a/TODO
+++ b/TODO
@@ -95,8 +95,6 @@ Hey Emacs, this is -*- outline -*- mode!
 ** If an operation failed, make sure that the result functions don't return
    corrupt partial information. !!!
    NOTE: The EOF status handler is not called in this case !!!
-** If no passphrase cb is installed, status handler is not run even if
-   password is required by crypto engine. !!
 ** Verify must not fail on NODATA premature if auto-key-retrieval failed.
    It should not fail silently if it knows there is an error. !!!
 ** All operations: Better error reporting. !!
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 974e1e20..5780a445 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-18  Marcus Brinkmann  <marcus@g10code.de>
+
+	* passphrase.c (_gpgme_passphrase_status_handler): Always run the
+	status handler.
+
 2004-08-17  Marcus Brinkmann  <marcus@g10code.de>
 
 	* rungpg.c (build_argv): Use --no-sk-comment, not --no-comment.
diff --git a/gpgme/passphrase.c b/gpgme/passphrase.c
index 9fa6a130..330246b7 100644
--- a/gpgme/passphrase.c
+++ b/gpgme/passphrase.c
@@ -62,9 +62,6 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code,
   void *hook;
   op_data_t opd;
 
-  if (!ctx->passphrase_cb)
-    return 0;
-
   err = _gpgme_op_data_lookup (ctx, OPDATA_PASSPHRASE, &hook,
 			       sizeof (*opd), release_op_data);
   opd = hook;