Index: /trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java	(revision 6408)
+++ /trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java	(revision 6409)
@@ -81,5 +81,4 @@
 
     public void initFromChangeset(Changeset cs) {
-        String currentComment = getTagEditorValue("comment");
         Map<String,String> tags = getDefaultTags();
         if (cs != null) {
@@ -87,8 +86,8 @@
         }
         if (tags.get("comment") == null) {
-            tags.put("comment", currentComment);
+            tags.put("comment", getTagEditorValue("comment"));
         }
         if (tags.get("source") == null) {
-            tags.put("source", "");
+            tags.put("source", getTagEditorValue("source"));
         }
         String agent = Version.getInstance().getAgentString(false);