diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
index cb3ae310b..1ef04c9fc 100755
--- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
@@ -168,7 +168,7 @@ private void init()
             this.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
 
         this.setKeybindingInput(KeybindingSet.Category.MAIN);
-        this.addKeybindingAction("plugin.keybindings.MAIN_RENAME",
+        this.addKeybindingAction("main-rename",
                                 new RenameAction());
 
         TransparentPanel northPanel = new TransparentPanel(new BorderLayout());
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
index e46ca7797..6179adb51 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
@@ -153,13 +153,13 @@ public void stateChanged(ChangeEvent evt)
         this.initPluginComponents();
 
         this.setKeybindingInput(KeybindingSet.Category.CHAT);
-        this.addKeybindingAction(   "plugin.keybindings.CHAT_NEXT_TAB",
+        this.addKeybindingAction(   "chat-nextTab",
                                     new ForwardTabAction());
-        this.addKeybindingAction(   "plugin.keybindings.CHAT_PREVIOUS_TAB",
+        this.addKeybindingAction(   "chat-previousTab",
                                     new BackwordTabAction());
-        this.addKeybindingAction(   "plugin.keybindings.CHAT_COPY",
+        this.addKeybindingAction(   "chat-copy",
                                     new CopyAction());
-        this.addKeybindingAction(   "plugin.keybindings.CHAT_PASTE",
+        this.addKeybindingAction(   "chat-paste",
                                     new PasteAction());
         this.addKeybindingAction(   "chat-openSmileys",
                                     new OpenSmileyAction());
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java
index 881eeef7d..339275ddf 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java
@@ -892,7 +892,6 @@ public String getPassword()
     public void setPassword(String password)
     {
         this.sshConfigurationForm.setPasswordField(password);
-        System.out.println("22222222222222222");
         savePersistentDetails();
     }