diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c
index 425938a1e..bb3bb8e24 100644
--- a/src/rsrv/caservertask.c
+++ b/src/rsrv/caservertask.c
@@ -59,7 +59,7 @@ if(threadNameToId(NAME)!=0)threadDestroy(threadNameToId(NAME));
 LOCAL void req_server (void *pParm)
 {
     unsigned priorityOfSelf = epicsThreadGetPrioritySelf ();
-    unsigned priorityOfUDP;
+    unsigned priorityOfBeacons;
     epicsThreadBooleanStatus tbs;
     struct sockaddr_in serverAddr;  /* server's address */
     osiSocklen_t addrSize;
@@ -180,16 +180,16 @@ LOCAL void req_server (void *pParm)
         epicsThreadSuspendSelf ();
     }
 
-    tbs  = epicsThreadHighestPriorityLevelBelow ( priorityOfSelf, &priorityOfUDP );
+    tbs  = epicsThreadHighestPriorityLevelBelow ( priorityOfSelf, &priorityOfBeacons );
     if ( tbs != epicsThreadBooleanStatusSuccess ) {
-        priorityOfUDP = priorityOfSelf;
+        priorityOfBeacons = priorityOfSelf;
     }
 
-    tid = epicsThreadCreate ( "CAS-UDP", priorityOfUDP,
-        epicsThreadGetStackSize (epicsThreadStackMedium),
-        cast_server, 0 );
+    tid = epicsThreadCreate ( "CAS-beacon", priorityOfBeacons,
+        epicsThreadGetStackSize (epicsThreadStackSmall),
+        rsrv_online_notify_task, 0 );
     if ( tid == 0 ) {
-        epicsPrintf ( "CAS: unable to start connection request thread\n" );
+        epicsPrintf ( "CAS: unable to start beacon thread\n" );
     }
 
     while (TRUE) {
diff --git a/src/rsrv/cast_server.c b/src/rsrv/cast_server.c
index bd5c7cd7f..0892b7465 100644
--- a/src/rsrv/cast_server.c
+++ b/src/rsrv/cast_server.c
@@ -110,8 +110,6 @@ LOCAL void clean_addrq()
 void cast_server(void *pParm)
 {
     unsigned            priorityOfSelf = epicsThreadGetPrioritySelf ();
-    unsigned            priorityOfBeacon;
-    epicsThreadBooleanStatus    tbs;
     struct sockaddr_in  sin;    
     int                 status;
     int                 count=0;
@@ -217,19 +215,7 @@ void cast_server(void *pParm)
     "%s: set socket option SO_REUSEADDR failed because \"%s\"\n", 
                 __FILE__, sockErrBuf );
     }
-    
-    tbs  = epicsThreadHighestPriorityLevelBelow ( priorityOfSelf, &priorityOfBeacon );
-    if ( tbs != epicsThreadBooleanStatusSuccess ) {
-        priorityOfBeacon = priorityOfSelf;
-    }
-
-    tid = epicsThreadCreate ( "CAS-beacon", priorityOfBeacon,
-        epicsThreadGetStackSize (epicsThreadStackSmall),
-        rsrv_online_notify_task, 0 );
-    if ( tid == 0 ) {
-        epicsPrintf ( "CAS: unable to start beacon thread\n" );
-    }
- 
+     
     /*
      * setup new client structure but reuse old structure if
      * possible
diff --git a/src/rsrv/online_notify.c b/src/rsrv/online_notify.c
index de0d172fb..e0031723a 100644
--- a/src/rsrv/online_notify.c
+++ b/src/rsrv/online_notify.c
@@ -47,7 +47,7 @@ static void  forcePort (ELLLIST *pList, unsigned short port)
     pNode  = (osiSockAddrNode *) ellFirst ( pList );
     while ( pNode ) {
         if ( pNode->addr.sa.sa_family == AF_INET ) {
-            pNode->addr.ia.sin_port = htons (port);
+            pNode->addr.ia.sin_port = htons ( port );
         }
         pNode = (osiSockAddrNode *) ellNext ( &pNode->node );
     }
@@ -58,21 +58,25 @@ static void  forcePort (ELLLIST *pList, unsigned short port)
  */
 void rsrv_online_notify_task(void *pParm)
 {
-    osiSockAddrNode     *pNode;
-    double              delay;
-    double              maxdelay;
-    long                longStatus;
-    double              maxPeriod;
-    caHdr               msg;
-    int                 status;
-    SOCKET              sock;
-    int                 true = TRUE;
-    unsigned short      port;
-    ca_uint32_t         beaconCounter = 0;
-    char                * pStr;
-    int                 autoBeaconAddr;
-    ELLLIST             autoAddrList;
-    char                buf[16];
+    unsigned                    priorityOfSelf = epicsThreadGetPrioritySelf ();
+    osiSockAddrNode             *pNode;
+    double                      delay;
+    double                      maxdelay;
+    long                        longStatus;
+    double                      maxPeriod;
+    caHdr                       msg;
+    int                         status;
+    SOCKET                      sock;
+    int                         true = TRUE;
+    unsigned short              port;
+    ca_uint32_t                 beaconCounter = 0;
+    char                        * pStr;
+    int                         autoBeaconAddr;
+    ELLLIST                     autoAddrList;
+    char                        buf[16];
+    unsigned                    priorityOfUDP;
+    epicsThreadBooleanStatus    tbs;
+    epicsThreadId               tid;
     
     taskwdInsert (epicsThreadGetIdSelf(),NULL,NULL);
     
@@ -162,9 +166,8 @@ void rsrv_online_notify_task(void *pParm)
 		ellInit ( &tmpList );
         addr.ia.sin_family = AF_UNSPEC;
         osiSockDiscoverBroadcastAddresses (&tmpList, sock, &addr); 
+        forcePort ( &tmpList, port );
 		removeDuplicateAddresses ( &autoAddrList, &tmpList, 1 );
-
-        forcePort ( &autoAddrList, port );
     }
             
     /*
@@ -194,20 +197,30 @@ void rsrv_online_notify_task(void *pParm)
     if ( ellCount ( &beaconAddrList ) == 0 ) {
         errlogPrintf ("The CA server's beacon address list was empty after initialization?\n");
     }
-    else {
-        forcePort ( &beaconAddrList, port );
-    }
   
 #   ifdef DEBUG
         printChannelAccessAddressList (&beaconAddrList);
 #   endif
+
+    tbs  = epicsThreadHighestPriorityLevelBelow ( priorityOfSelf, &priorityOfUDP );
+    if ( tbs != epicsThreadBooleanStatusSuccess ) {
+        priorityOfUDP = priorityOfSelf;
+    }
+
+    tid = epicsThreadCreate ( "CAS-UDP", priorityOfUDP,
+        epicsThreadGetStackSize (epicsThreadStackMedium),
+        cast_server, 0 );
+    if ( tid == 0 ) {
+        epicsPrintf ( "CAS: unable to start UDP daemon thread\n" );
+    }
     
     while (TRUE) {  
         pNode = (osiSockAddrNode *) ellFirst (&beaconAddrList);
         while (pNode) {
             char buf[64];
  
-            status = connect (sock, &pNode->addr.sa, sizeof(pNode->addr.sa));
+            status = connect (sock, &pNode->addr.sa, 
+                sizeof(pNode->addr.sa));
             if (status<0) {
                 char sockErrBuf[64];
                 epicsSocketConvertErrnoToString (