diff --git a/contracts/StreamManager.vy b/contracts/StreamManager.vy
index b9a559f..a23f668 100644
--- a/contracts/StreamManager.vy
+++ b/contracts/StreamManager.vy
@@ -142,11 +142,11 @@ def transfer_control(new_controller: address):
     # NOTE: can revoke transfer at any time calling this method with `self.controller`
     assert msg.sender == self.controller  # dev: not controller
 
-    log NewControllerProposed(msg.sender, new_controller)
-
     self.new_controller = new_controller
     self.new_controller_proposed = block.timestamp
 
+    log NewControllerProposed(msg.sender, new_controller)
+
 
 @external
 def accept_control():
@@ -162,11 +162,11 @@ def accept_control():
     assert msg.sender == self.new_controller  # dev: not proposed controller
     assert block.timestamp - self.new_controller_proposed >= CONTROLLER_ACCEPTANCE_DELAY
 
-    log NewControllerAccepted(self.controller, msg.sender)
-
     self.controller = msg.sender
     self.new_controller = empty(address)
 
+    log NewControllerAccepted(self.controller, msg.sender)
+
 
 @external
 def set_capabilities(account: address, capabilities: Ability):