Index: trunk/src/org/openstreetmap/josm/io/OsmConnection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 1958)
+++ trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 1962)
@@ -25,5 +25,4 @@
 import org.openstreetmap.josm.tools.Base64;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.io.CredentialsManager.CMException;
 
 /**
@@ -115,5 +114,5 @@
                 auth = credentialsManager.lookupUsername() + ":" + credentialsManager.lookupPassword();
             }
-        } catch (CMException e) {
+        } catch (CredentialsManager.CMException e) {
             auth = ":";
         }
@@ -237,5 +236,5 @@
                             "WARNING: The password is stored in plain text in the preferences file.<br>" +
                             "The password is transferred in plain text to the server, encoded in the URL.<br>" +
-                            "<b>Do not use a valuable Password.</b></html>"));
+                    "<b>Do not use a valuable Password.</b></html>"));
                     warning.setFont(warning.getFont().deriveFont(Font.ITALIC));
                     panel.add(warning, GBC.eop().fill(GBC.HORIZONTAL));
@@ -244,8 +243,10 @@
                     String newUsername = osmDataUsername.getText();
                     String newPassword = String.valueOf(osmDataPassword.getPassword());
-                    if (!oldUsername.equals(newUsername))
+                    if (!oldUsername.equals(newUsername)) {
                         storeUsername(newUsername);
-                    if (!oldPassword.equals(newPassword))
+                    }
+                    if (!oldPassword.equals(newPassword)) {
                         storePassword(newPassword);
+                    }
                 }
             };