diff --git a/src/it/announce-generate/src/changes/changes.xml b/src/it/announce-generate/src/changes/changes.xml
index 48c21a4..7c86280 100644
--- a/src/it/announce-generate/src/changes/changes.xml
+++ b/src/it/announce-generate/src/changes/changes.xml
@@ -40,7 +40,7 @@
         <dueto name="John Doe" email="john@doe.com"/>
         <dueto name="Jane Doe"/>
       </action>
-      <action dev="you" type="update" issue="MCHANGES-999" system="bugzilla">
+      <action dev="you" type="update" issue="MCHANGES-999" system="bugzilla" due-to="External Submitter">
         Handle different issue systems.
         <fixes issue="bug-12345"/>
         <dueto name="John Doe" email="john@doe.com"/>
diff --git a/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java b/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java
index 0b30e51..af972e6 100644
--- a/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java
+++ b/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java
@@ -32,7 +32,7 @@
 /**
  * An adapter that can adapt data models from other issue management system to the data models used in the changes.xml
  * file.
- * 
+ *
  * @author Dennis Lundberg
  * @version $Id$
  * @since 2.4
@@ -60,7 +60,7 @@
 
     /**
      * Adapt a <code>List</code> of <code>Issue</code>s to a <code>List</code> of <code>Release</code>s.
-     * 
+     *
      * @param issues The issues
      * @return A list of releases
      */
@@ -105,7 +105,7 @@
 
     /**
      * Create an <code>Action</code> from an issue.
-     * 
+     *
      * @param issue The issue to extract the information from
      * @return An <code>Action</code>
      */
@@ -131,9 +131,7 @@
 
         action.setDev( issue.getAssignee() );
 
-        // Set dueTo to the empty String instead of null to make Velocity happy
-        action.setDueTo( "" );
-        // action.setDueTo( issue.getReporter() );
+        action.setDueTo( issue.getReporter() == null ? "" : issue.getReporter() );
 
         action.setAction( issue.getSummary() );
         return action;