diff --git a/build.xml b/build.xml
index 6a66fa1e6..1927c69ae 100644
--- a/build.xml
+++ b/build.xml
@@ -1142,7 +1142,7 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset src="${lib.noinst}/joscar-client.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-common.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta2.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta4.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/>
         </jar>
     </target>
@@ -1157,7 +1157,7 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset src="${lib.noinst}/joscar-client.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-common.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta2.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta4.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/>
         </jar>
     </target>
diff --git a/lib/installer-exclude/joscar-client.jar b/lib/installer-exclude/joscar-client.jar
index 8be00c9a3..63030e840 100644
Binary files a/lib/installer-exclude/joscar-client.jar and b/lib/installer-exclude/joscar-client.jar differ
diff --git a/lib/installer-exclude/joscar-common.jar b/lib/installer-exclude/joscar-common.jar
index d09cf3fd1..47c80bfd3 100644
Binary files a/lib/installer-exclude/joscar-common.jar and b/lib/installer-exclude/joscar-common.jar differ
diff --git a/lib/installer-exclude/joscar-protocol.jar b/lib/installer-exclude/joscar-protocol.jar
index 50ce8ca47..0fa1c23d1 100644
Binary files a/lib/installer-exclude/joscar-protocol.jar and b/lib/installer-exclude/joscar-protocol.jar differ
diff --git a/lib/installer-exclude/jsocks-klea.jar b/lib/installer-exclude/jsocks-klea.jar
index e06166f3f..b9bce3d9f 100644
Binary files a/lib/installer-exclude/jsocks-klea.jar and b/lib/installer-exclude/jsocks-klea.jar differ
diff --git a/lib/installer-exclude/retroweaver-rt-2.0Beta2.jar b/lib/installer-exclude/retroweaver-rt-2.0Beta2.jar
deleted file mode 100644
index 8b97db615..000000000
Binary files a/lib/installer-exclude/retroweaver-rt-2.0Beta2.jar and /dev/null differ
diff --git a/lib/installer-exclude/retroweaver-rt-2.0Beta4.jar b/lib/installer-exclude/retroweaver-rt-2.0Beta4.jar
new file mode 100644
index 000000000..baf70b994
Binary files /dev/null and b/lib/installer-exclude/retroweaver-rt-2.0Beta4.jar differ
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java
index 9b1a128c7..678813af5 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java
@@ -1520,7 +1520,7 @@ public void authorizationRequestReceived(Screenname screenname,
                     authResponse.getReason());
         }
 
-        public boolean authorizationRequired(Screenname screenname)
+        public boolean authorizationRequired(Screenname screenname, Group parentGroup)
         {
             logger.trace("authorizationRequired from " + screenname);
 
@@ -1528,7 +1528,11 @@ public boolean authorizationRequired(Screenname screenname)
             Contact srcContact = findContactByID(screenname.getFormatted());
 
             if(srcContact == null)
-                srcContact = createVolatileContact(screenname.getFormatted());
+            {
+                ContactGroup parent = ssContactList.findContactGroup(parentGroup);
+                srcContact = 
+                    createUnresolvedContact(screenname.getFormatted(), null, parent);
+            }
 
             AuthorizationRequest authRequest =
                 authorizationHandler.createAuthorizationRequest(
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java
index 44c5e48d0..d3241bcf1 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java
@@ -567,7 +567,7 @@ public void postTestSubscribe()
         }
 
         assertEquals("Subscription event dispatching failed."
-                     , 2, subEvtCollector.collectedEvents.size());
+                     , 1, subEvtCollector.collectedEvents.size());
 
         // after the authorization process finished
         // we must have received two events
@@ -593,33 +593,6 @@ public void postTestSubscribe()
             srcProvider = subEvt.getSourceProvider();
         }
 
-        assertEquals("SubscriptionEvent Source:",
-                     fixture.testerAgent.getIcqUIN(),
-                     ((Contact)source).getAddress());
-        assertEquals("SubscriptionEvent Source Contact:",
-                     fixture.testerAgent.getIcqUIN(),
-                     srcContact.getAddress());
-        assertSame("SubscriptionEvent Source Provider:",
-                     fixture.provider,
-                     srcProvider);
-
-        evt = (EventObject)subEvtCollector.collectedEvents.get(1);
-
-        source = null;
-        srcContact = null;
-        srcProvider = null;
-
-        if(evt instanceof SubscriptionMovedEvent)
-        {
-            SubscriptionMovedEvent mvEvt = (SubscriptionMovedEvent)evt;
-
-            source = mvEvt.getSource();
-            srcContact = mvEvt.getSourceContact();
-            srcProvider = mvEvt.getSourceProvider();
-        }
-        else
-            fail("Second event must be SubscriptionMovedEvent");
-
         assertEquals("SubscriptionEvent Source:",
                      fixture.testerAgent.getIcqUIN(),
                      ((Contact)source).getAddress());