Index: applications/editors/josm/plugins/usertools/src/usertools/UserToolsPlugin.java
===================================================================
--- applications/editors/josm/plugins/usertools/src/usertools/UserToolsPlugin.java	(revision 13497)
+++ applications/editors/josm/plugins/usertools/src/usertools/UserToolsPlugin.java	(revision 14125)
@@ -1,4 +1,5 @@
 package usertools;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -7,8 +8,12 @@
 import java.io.UnsupportedEncodingException;
 
-import javax.swing.*;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JViewport;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
 
 import org.openstreetmap.josm.actions.JosmAction;
-//import org.openstreetmap.josm.actions.search.*;
 import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.gui.dialogs.UserListDialog;
@@ -65,11 +70,9 @@
         MainMenu menu = Main.main.menu;
 
-        if (userJMenu == null) {
-            userJMenu = new JMenu(tr("User"));
-            menu.add(userJMenu, KeyEvent.VK_U, "user");
-            menu.add(userJMenu, 5);
-        } else {
+        if (userJMenu == null)
+            userJMenu = menu.addMenu(marktr("User"), KeyEvent.VK_U, menu.defaultMenuPos);
+        else
             userJMenu.removeAll();
-        }
+
         JosmAction a = new JosmAction(tr("Show Author Panel"),
         "dialogs/userlist", tr("Show Author Panel"), null, false) {
@@ -90,5 +93,5 @@
         };
         a.putValue("toolbar", "usertools_show");
-        userJMenu.add(new JMenuItem(a));
+        menu.add(userJMenu,a);
 
         userJMenu.addSeparator();
@@ -105,5 +108,5 @@
         };
         a.putValue("toolbar", "usertools_open");
-        userJMenu.add(new JMenuItem(a));
+        menu.add(userJMenu,a);
 
         a = new JosmAction(tr("Select User's Data"),
@@ -118,5 +121,5 @@
         };
         a.putValue("toolbar", "usertools_search");
-        userJMenu.add(new JMenuItem(a));
+        menu.add(userJMenu,a);
 
         setEnabledAll(false);