diff --git a/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java b/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
index 1c33887c3..e31b7071a 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
@@ -675,7 +675,7 @@ private Element createProtoContactNode(Contact protoContact)
 
         protoContactElement.setAttribute(
             ACCOUNT_ID_ATTR_NAME
-            , protoContact.getProtocolProvider().getAccountID().getAccountUID());
+            , protoContact.getProtocolProvider().getAccountID().getAccountUniqueID());
 
         protoContactElement.setAttribute(
             PARENT_PROTO_GROUP_UID_ATTR_NAME
@@ -708,7 +708,7 @@ private Element createProtoContactGroupNode(ContactGroup protoGroup)
 
         protoGroupElement.setAttribute(
             ACCOUNT_ID_ATTR_NAME
-            , protoGroup.getProtocolProvider().getAccountID().getAccountUID());
+            , protoGroup.getProtocolProvider().getAccountID().getAccountUniqueID());
 
         protoGroupElement.setAttribute(
             PARENT_PROTO_GROUP_UID_ATTR_NAME
diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactGroupImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactGroupImpl.java
index 7f333d105..ce69b75f0 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MetaContactGroupImpl.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactGroupImpl.java
@@ -408,7 +408,7 @@ public Iterator getContactGroupsForAccountID(String accountID)
             ContactGroup group = (ContactGroup)encapsulatedGroups.next();
 
             if(group.getProtocolProvider().getAccountID()
-               .getAccountUID().equals(accountID))
+               .getAccountUniqueID().equals(accountID))
             {
                 protoGroups.add(group);
             }
diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
index 9eeb4475e..e328b1eb7 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
@@ -1250,7 +1250,7 @@ private void handleProviderAdded(
                 .getName());
 
         this.currentlyInstalledProviders.put(
-                           provider.getAccountID().getAccountUID(), provider);
+                           provider.getAccountID().getAccountUniqueID(), provider);
 
         //If we have a persistent presence op set - then retrieve its contat
         //list and merge it with the local one.
@@ -1261,12 +1261,12 @@ private void handleProviderAdded(
             try
             {
                 storageManager.extractContactsForAccount(
-                    provider.getAccountID().getAccountUID());
+                    provider.getAccountID().getAccountUniqueID());
             }
             catch (XMLException exc)
             {
                 logger.error("Failed to load contacts for account "
-                             + provider.getAccountID().getAccountUID(), exc);
+                             + provider.getAccountID().getAccountUniqueID(), exc);
             }
 
             synchronizeOpSetWithLocalContactList(opSetPersPresence);
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 556bb0a18..56eb96e10 100755
--- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
@@ -302,7 +302,7 @@ public ProtocolProviderService getProtocolProviderForAccount(
             ProtocolProviderService pps 
                 = (ProtocolProviderService)protocolProviders.get(i);
             
-            if (pps.getAccountID().getAccountUserID().equals(accountName)) {
+            if (pps.getAccountID().getUserID().equals(accountName)) {
                return pps; 
             }
         }
@@ -363,7 +363,7 @@ public void activateAccount(ProtocolProviderService protocolProvider) {
      * @return The account user id for the given protocol provider.
      */
     public String getAccount(ProtocolProviderService protocolProvider) {
-        return protocolProvider.getAccountID().getAccountUserID();
+        return protocolProvider.getAccountID().getUserID();
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java
index f8a47717a..1a5f78276 100644
--- a/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java
@@ -83,7 +83,7 @@ public StatusSelectorBox(MainFrame mainFrame,
         this.mainFrame = mainFrame;
         this.protocolProvider = protocolProvider;
 
-        this.setToolTipText(protocolProvider.getAccountID().getAccountUserID());
+        this.setToolTipText(protocolProvider.getAccountID().getUserID());
         
         this.init();
     }
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/message/auth/AuthCmdFactory.java b/src/net/java/sip/communicator/impl/protocol/icq/message/auth/AuthCmdFactory.java
index f88606107..54d2da248 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/message/auth/AuthCmdFactory.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/message/auth/AuthCmdFactory.java
@@ -171,7 +171,7 @@ public SnacCommand handle(IcbmChannelFourCommand messageCommand)
                 aimConnection.getInfoService().sendSnac(
                     new AuthReplyCmd(
                         String.valueOf(icqProvider.getAccountID().
-                                       getAccountUserID()),
+                                       getUserID()),
                         authResponse.getReason(),
                         true));
             }
@@ -181,7 +181,7 @@ else if (authResponse.getResponseCode() ==
                 aimConnection.getInfoService().sendSnac(
                     new AuthReplyCmd(
                         String.valueOf(icqProvider.getAccountID().
-                                       getAccountUserID()),
+                                       getUserID()),
                         authResponse.getReason(),
                         false));
             }