diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationExecutor.java b/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationExecutor.java
index 9286007c..83f9fb50 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationExecutor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationExecutor.java
@@ -115,7 +115,9 @@ public class RebindOperationExecutor implements
      */
     public void performOperation() {
         log.debug("Performing rebind operation - "
+                + "renaming original entry and "
                 + "binding new contents to entry.");
+        ldapOperations.rename(originalDn, temporaryDn);
         ldapOperations.bind(originalDn, originalObject, originalAttributes);
     }
 
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationRecorder.java b/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationRecorder.java
index 96ec0225..3fd517af 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationRecorder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindOperationRecorder.java
@@ -68,7 +68,6 @@ public class RebindOperationRecorder implements
 
         Name temporaryName = renamingStrategy.getTemporaryName(dn);
 
-        ldapOperations.rename(dn, temporaryName);
         return new RebindOperationExecutor(ldapOperations, dn, temporaryName,
                 object, attributes);
     }
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationExecutor.java b/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationExecutor.java
index 0e3a2f02..fc28e284 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationExecutor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationExecutor.java
@@ -97,7 +97,9 @@ public class UnbindOperationExecutor implements
      * @see org.springframework.ldap.support.transaction.CompensatingTransactionOperationExecutor#performOperation()
      */
     public void performOperation() {
-        log.debug("Nothing to do in performOperation for unbind");
+        log.debug("Performing operation for unbind -"
+                + " renaming to temporary entry.");
+        ldapOperations.rename(originalDn, temporaryDn);
     }
 
     LdapOperations getLdapOperations() {
diff --git a/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationRecorder.java b/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationRecorder.java
index a9099001..a7ef7746 100644
--- a/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationRecorder.java
+++ b/sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindOperationRecorder.java
@@ -55,8 +55,6 @@ public class UnbindOperationRecorder implements
         Name dn = LdapUtils.getFirstArgumentAsName(args);
         Name temporaryDn = renamingStrategy.getTemporaryName(dn);
 
-        ldapOperations.rename(dn, temporaryDn);
-
         return new UnbindOperationExecutor(ldapOperations, dn, temporaryDn);
     }
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationExecutorTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationExecutorTest.java
index bb103cae..acec6219 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationExecutorTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationExecutorTest.java
@@ -43,6 +43,7 @@ public class RebindOperationExecutorTest extends TestCase {
                 ldapOperationsMock, expectedOriginalDn, expectedTempDn,
                 expectedObject, expectedAttributes);
 
+        ldapOperationsMock.rename(expectedOriginalDn, expectedTempDn);
         ldapOperationsMock.bind(expectedOriginalDn, expectedObject,
                 expectedAttributes);
 
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationRecorderTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationRecorderTest.java
index f02cb075..4358b05a 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationRecorderTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindOperationRecorderTest.java
@@ -59,8 +59,6 @@ public class RebindOperationRecorderTest extends TestCase {
         renamingStrategyControl.expectAndReturn(renamingStrategyMock
                 .getTemporaryName(expectedDn), expectedTempDn);
 
-        ldapOperationsMock.rename(expectedDn, expectedTempDn);
-
         replay();
         Object expectedObject = new Object();
         BasicAttributes expectedAttributes = new BasicAttributes();
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationExecutorTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationExecutorTest.java
index 144fa85b..8f501168 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationExecutorTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationExecutorTest.java
@@ -37,8 +37,8 @@ public class UnbindOperationExecutorTest extends TestCase {
         UnbindOperationExecutor tested = new UnbindOperationExecutor(
                 ldapOperationsMock, expectedOldName, expectedTempName);
 
-        // Nothing to do in performOperation for unbind.
-
+        ldapOperationsMock.rename(expectedOldName, expectedTempName);
+        
         replay();
         // Perform test
         tested.performOperation();
diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationRecorderTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationRecorderTest.java
index d7601ba7..e2eb9278 100644
--- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationRecorderTest.java
+++ b/sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindOperationRecorderTest.java
@@ -57,8 +57,6 @@ public class UnbindOperationRecorderTest extends TestCase {
         renamingStrategyControl.expectAndReturn(renamingStrategyMock
                 .getTemporaryName(expectedDn), expectedTempName);
 
-        ldapOperationsMock.rename(expectedDn, expectedTempName);
-
         replay();
         // Perform test
         CompensatingTransactionOperationExecutor operation = tested