diff --git a/slsDetectorServers/eigerDetectorServer/Beb.c b/slsDetectorServers/eigerDetectorServer/Beb.c
index 3ae975ec4..548280cfe 100644
--- a/slsDetectorServers/eigerDetectorServer/Beb.c
+++ b/slsDetectorServers/eigerDetectorServer/Beb.c
@@ -391,7 +391,10 @@ int Beb_SetMaster(enum MASTERINDEX ind) {
 }
 
 int Beb_SetActivate(int enable) {
-    enable = enable == 0 ? 0 : 1;
+    if (enable < 0) {
+        LOG(logERROR, ("Invalid enable value\n"));
+        return 0;
+    }
     u_int32_t *csp0base = 0;
     int fd = Beb_open(&csp0base, XPAR_PLB_GPIO_SYS_BASEADDR);
     if (fd < 0) {
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
index c64681ea7..c9e4a71df 100644
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
@@ -1880,7 +1880,6 @@ int setActivate(int enable) {
         LOG(logERROR, ("Invalid activate argument: %d\n", enable));
         return FAIL;
     }
-    enable = enable == 0 ? 0 : 1;
 #ifdef VIRTUAL
     eiger_virtual_activate = enable;
 #else
@@ -1889,12 +1888,12 @@ int setActivate(int enable) {
     }
     Feb_Control_activate(enable);
 #endif
-    if (enable == 0) {
-        LOG(logINFORED, ("Deactivated in %s Server!\n",
-                         isControlServer ? " Control" : "Stop"));
-    } else {
+    if (enable) {
         LOG(logINFOGREEN, ("Activated in %s Server!\n",
                            isControlServer ? " Control" : "Stop"));
+    } else {
+        LOG(logINFORED, ("Deactivated in %s Server!\n",
+                         isControlServer ? " Control" : "Stop"));
     }
     return OK;
 }