diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp
index 9c311651..d5d37fe3 100644
--- a/mission/devices/SolarArrayDeploymentHandler.cpp
+++ b/mission/devices/SolarArrayDeploymentHandler.cpp
@@ -347,10 +347,12 @@ ReturnValue_t SolarArrayDeploymentHandler::executeAction(ActionId_t actionId,
       return HasActionsIF::IS_BUSY;
     }
     actionActive = true;
+    rememberCommanderId = commandedBy;
     return result;
   } else if (actionId == SWITCH_OFF_DEPLOYMENT) {
     startFsmOff();
     actionActive = true;
+    rememberCommanderId = commandedBy;
     return result;
   } else {
     return HasActionsIF::INVALID_ACTION_ID;