diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
index 746492bfb..986474aed 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
@@ -951,7 +951,7 @@ else if (response.getStatusCode() == Response.FORBIDDEN)
             processed = true;
         }
         //errors
-        else if ( response.getStatusCode() / 100 == 4 )
+        else if ( response.getStatusCode() >= 400 )
         {
             logger.error("Received an error response.");
 
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java b/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java
index cc401d2ad..eee7d9be4 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java
@@ -500,9 +500,9 @@ private CredentialsCacheEntry createCcEntryWithNewCredentials(
         String authName = accountID.getAccountPropertyString(
                                     ProtocolProviderFactory.AUTHORIZATION_NAME);
         if(authName != null && authName.length() > 0)
-            ccEntry.userCredentials.setUserName(authName);
+            defaultCredentials.setUserName(authName);
         else
-            ccEntry.userCredentials.setUserName(accountID.getUserID());
+            defaultCredentials.setUserName(accountID.getUserID());
 
         UserCredentials newCredentials = 
             getSecurityAuthority().obtainCredentials(