Index: trunk/drbd/drbd_actlog.c
===================================================================
--- trunk/drbd/drbd_actlog.c	(revision 6152)
+++ trunk/drbd/drbd_actlog.c	(working copy)
@@ -259,6 +259,14 @@
 		spin_unlock_irq(&mdev->al_lock);
 		wake_up(&mdev->al_wait);
 	}
+
+   if (mdev->state.role == Primary && 
+       mdev->bc->md.uuid[Bitmap] == 0 &&   
+       mdev->state.conn == StandAlone) {
+      /* Only do it if we have not yet done it... */
+      drbd_uuid_new_current(mdev);
+   }
+  
 }
 
 void drbd_al_complete_io(struct Drbd_Conf *mdev, sector_t sector)
Index: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	(revision 6152)
+++ trunk/drbd/drbd_main.c	(working copy)
@@ -900,11 +900,6 @@
 			mdev->p_uuid = NULL;
 		}
 		if (inc_local(mdev)) {
-			if (ns.role == Primary && mdev->bc->md.uuid[Bitmap] == 0 ) {
-				/* Only do it if we have not yet done it... */
-				INFO("Creating new current UUID\n");
-				drbd_uuid_new_current(mdev);
-			}
 			if (ns.peer == Primary ) { 
 				/* Note: The condition ns.peer == Primary implies
 				   that we are connected. Otherwise it would