diff --git a/src/controller/account_test.go b/src/controller/account_test.go
index b635fac..868be69 100644
--- a/src/controller/account_test.go
+++ b/src/controller/account_test.go
@@ -154,12 +154,12 @@ func TestUpdateAccountHandler(t *testing.T) {
 		accountController.accountRepository.Create(&account1)
 
 		// Update the account
-		accountV2.Domain.ID = "123-controller-update-account"
-		accountV2.Environment = "default"
-		accountV2.Domain.Message = "Updated successfully"
+		account1.Domain.Message = "Updated successfully"
+		account1.Settings.Window = "5m"
+		account1.Settings.Active = false
 
 		// Test
-		payload, _ := json.Marshal(accountV2)
+		payload, _ := json.Marshal(account1)
 		req, _ := http.NewRequest(http.MethodPut, accountController.routeAccountPath, bytes.NewBuffer(payload))
 		response := executeRequest(req, r, token)
 
@@ -174,6 +174,7 @@ func TestUpdateAccountHandler(t *testing.T) {
 		assert.Equal(t, model.StatusSynced, accountResponse.Domain.Status)
 		assert.Equal(t, "Updated successfully", accountResponse.Domain.Message)
 		assert.Equal(t, "5m", accountResponse.Settings.Window)
+		assert.False(t, accountResponse.Settings.Active)
 	})
 
 	t.Run("Should update account token only", func(t *testing.T) {
diff --git a/src/controller/controller_test.go b/src/controller/controller_test.go
index 63de84a..89efa5a 100644
--- a/src/controller/controller_test.go
+++ b/src/controller/controller_test.go
@@ -107,18 +107,3 @@ var accountV1 = model.Account{
 		ForcePrune: false,
 	},
 }
-
-var accountV2 = model.Account{
-	Repository:  "switcherapi/switcher-gitops",
-	Branch:      "main",
-	Environment: "default",
-	Domain: model.DomainDetails{
-		ID:   "123-controller-test",
-		Name: "Switcher GitOps",
-	},
-	Settings: model.Settings{
-		Active:     false,
-		Window:     "5m",
-		ForcePrune: true,
-	},
-}
diff --git a/src/repository/account.go b/src/repository/account.go
index 2a2df40..ea88e55 100644
--- a/src/repository/account.go
+++ b/src/repository/account.go
@@ -183,8 +183,9 @@ func getUpdateFields(account *model.Account) bson.M {
 	setIfNotEmpty(setMap, "domain.message", account.Domain.Message)
 
 	setIfNotEmpty(setMap, "settings.window", account.Settings.Window)
-	setIfNotEmpty(setMap, "settings.forcePrune", account.Settings.ForcePrune)
-	setIfNotEmpty(setMap, "settings.active", account.Settings.Active)
+
+	setMap["settings.active"] = account.Settings.Active
+	setMap["settings.forcePrune"] = account.Settings.ForcePrune
 
 	update := bson.M{"$set": setMap}
 	return update