Index: /applications/editors/josm/plugins/usertools/build.xml
===================================================================
--- /applications/editors/josm/plugins/usertools/build.xml	(revision 17358)
+++ /applications/editors/josm/plugins/usertools/build.xml	(revision 17359)
@@ -22,5 +22,5 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Tools to work with authors/users. Selects map data that belongs to selected user, opens browser showing selected author profile page."/>
-                <attribute name="Plugin-Mainversion" value="1465"/>
+                <attribute name="Plugin-Mainversion" value="2012"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/usertools/src/usertools/UserToolsPlugin.java
===================================================================
--- /applications/editors/josm/plugins/usertools/src/usertools/UserToolsPlugin.java	(revision 17358)
+++ /applications/editors/josm/plugins/usertools/src/usertools/UserToolsPlugin.java	(revision 17359)
@@ -79,14 +79,5 @@
             public void actionPerformed(ActionEvent ev) {
                 int dialogIndex = 100;
-                for (int i = 0; i < Main.map.toggleDialogs.getComponentCount(); i++) {
-
-                    if (Main.map.toggleDialogs.getComponent(i).getClass()
-                            .getSimpleName().equals("UserListDialog")) {
-
-                        dialogIndex = i;
-                    }
-                }
-                UserListDialog uld = (UserListDialog) Main.map.toggleDialogs.getComponent(dialogIndex);
-
+                UserListDialog uld = Main.map.getToggleDialog(UserListDialog.class);
                 uld.setVisible(true);
             }
@@ -128,15 +119,6 @@
     public static String getSelectedUser(){
         int dialogIndex = 100;
-        for (int i = 0; i < Main.map.toggleDialogs.getComponentCount(); i++) {
-
-            //  System.out.println(Main.map.toggleDialogs.getComponent(i)
-            //      .getClass().getSimpleName());
-
-            if (Main.map.toggleDialogs.getComponent(i).getClass()
-                    .getSimpleName().equals("UserListDialog")) {
-                dialogIndex = i;
-            }
-        }
-        UserListDialog uld = (UserListDialog) Main.map.toggleDialogs.getComponent(dialogIndex);
+        
+        UserListDialog uld = Main.map.getToggleDialog(UserListDialog.class);
 
         //these are hard coded, probably better to search, like above