Index: /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 17835)
+++ /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 17836)
@@ -255,6 +255,5 @@
 
     private static User getCurrentUser() {
-        UserIdentityManager userMgr = UserIdentityManager.getInstance();
-        return User.createOsmUser(userMgr.getUserId(), userMgr.getUserName());
+        return UserIdentityManager.getInstance().asUser();
     }