diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java
index d05256dc1..5e71b7b42 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java
@@ -189,7 +189,15 @@ public void register(SecurityAuthority authority)
                 credentials = authority.obtainCredentials(ProtocolNames.ICQ
                                                           , credentials);
                 //extract the password the user passed us.
-                password = new String(credentials.getPassword());
+                char[] pass = credentials.getPassword();
+
+                // the user didn't provide us a password (canceled the operation)
+                if(pass == null)
+                {
+                    return;
+                }
+
+                password = new String(pass);
 
                 if (credentials.isPasswordPersistent())
                 {
@@ -500,7 +508,7 @@ private void fireRegistrationStateChanged(  State      oldJoustSimState,
      * @param reason a String further explaining the reason code or null if
      * no such explanation is necessary.
      */
-    private void fireRegistrationStateChanged( RegistrationState oldState,
+    void fireRegistrationStateChanged( RegistrationState oldState,
                                                RegistrationState newState,
                                                int               reasonCode,
                                                String            reason)
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
index ebdb01b51..2e04c37dd 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -104,7 +104,14 @@ public void register(final SecurityAuthority authority)
                     , credentials);
 
                 //extract the password the user passed us.
-                password = new String(credentials.getPassword());
+                char[] pass = credentials.getPassword();
+
+                // the user didn't provide us a password (canceled the operation)
+                if(pass == null)
+                    return;
+
+                password = new String(pass);
+
 
                 if (credentials.isPasswordPersistent())
                 {