Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 645d9ed2a676dc71859db456dc0f1b504767fcea)
+++ kernel/generic/src/ipc/ipc.c	(revision 1b4b7b62eac15065eb8b971ffc04b9d7b25e970f)
@@ -195,4 +195,11 @@
 
 	call->flags |= IPC_CALL_ANSWERED;
+
+	if (call->flags & IPC_CALL_FORWARDED) {
+		if (call->data.caller_phone) {
+			/* Demasquerade the caller phone. */
+			call->data.phone = call->data.caller_phone;
+		}
+	}
 
 	spinlock_lock(&callerbox->lock);
@@ -396,8 +403,5 @@
 		request = list_get_instance(box->answers.next, call_t, link);
 		list_remove(&request->link);
-		if (request->data.caller_phone)
-			atomic_dec(&request->data.caller_phone->active_calls);
-		else
-			atomic_dec(&request->data.phone->active_calls);
+		atomic_dec(&request->data.phone->active_calls);
 	} else if (!list_empty(&box->calls)) {
 		/* Handle requests */