diff --git a/apier/v1/accounts.go b/apier/v1/accounts.go
index f886c4299..869a401a8 100644
--- a/apier/v1/accounts.go
+++ b/apier/v1/accounts.go
@@ -190,7 +190,7 @@ func (self *ApierV1) SetAccount(attr utils.AttrSetAccount, reply *string) (err e
 				// clean previous action plans
 				for i := 0; i < len(acntAPids); {
 					apID := acntAPids[i]
-					if attr.ActionPlanId == apID {
+					if apID == attr.ActionPlanId {
 						i++ // increase index since we don't remove from slice
 						continue
 					}
@@ -276,7 +276,7 @@ func (self *ApierV1) SetAccount(attr utils.AttrSetAccount, reply *string) (err e
 	if err != nil {
 		return utils.NewErrServerError(err)
 	}
-	if attr.ReloadScheduler && len(dirtyActionPlans) > 0 {
+	if attr.ReloadScheduler {
 		sched := self.ServManager.GetScheduler()
 		if sched == nil {
 			return errors.New(utils.SchedulerNotRunningCaps)
diff --git a/apier/v2/accounts.go b/apier/v2/accounts.go
index b5dc5b645..117073219 100644
--- a/apier/v2/accounts.go
+++ b/apier/v2/accounts.go
@@ -227,7 +227,7 @@ func (self *ApierV2) SetAccount(attr AttrSetAccount, reply *string) error {
 	if err != nil {
 		return utils.NewErrServerError(err)
 	}
-	if attr.ReloadScheduler && len(dirtyActionPlans) > 0 {
+	if attr.ReloadScheduler {
 		sched := self.ServManager.GetScheduler()
 		if sched == nil {
 			return errors.New(utils.SchedulerNotRunningCaps)
diff --git a/general_tests/cdrs_onexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go
similarity index 100%
rename from general_tests/cdrs_onexp_it_test.go
rename to general_tests/cdrs_onlexp_it_test.go