diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
index 478d24861..3d38da350 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
@@ -86,6 +86,8 @@ public AccountsConfigurationForm(MainFrame mainFrame)
         this.buttonsPanel.add(newButton);
         this.buttonsPanel.add(saveButton);
 
+        this.getRootPane().setDefaultButton(saveButton);
+
         this.scrollPane.getViewport().add(wrapAccountsPanel);
 
         this.wrapAccountsPanel.add(accountsPanel, BorderLayout.NORTH);
@@ -264,9 +266,10 @@ public void save()
             {
                 accountProperties.put(ProtocolProviderFactory.PASSWORD,
                     new String(passwordField.getPassword()));
-            }
 
-            providerFactory.modifyAccount(protocolProvider, accountProperties);
+                providerFactory
+                    .modifyAccount(protocolProvider, accountProperties);
+            }
         }
 
         public void actionPerformed(ActionEvent e)