diff --git a/db/routines/vn/events/clientsDisable.sql b/db/routines/vn/events/clientsDisable.sql
index 238e060ddb..35e6554a2d 100644
--- a/db/routines/vn/events/clientsDisable.sql
+++ b/db/routines/vn/events/clientsDisable.sql
@@ -7,15 +7,19 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`clientsDisable`
 DO BEGIN
 	UPDATE account.user u
 			JOIN client c ON c.id = u.id
+			LEFT JOIN account.account a ON a.id = u.id
 		SET u.active = FALSE
 		WHERE c.typeFk = 'normal'
+			AND a.id IS NULL
+			AND u.active
+			AND c.created < util.VN_CURDATE() - INTERVAL 12 MONTH 
 			AND u.id NOT IN (
 				SELECT DISTINCT c.id
 					FROM client c
 						LEFT JOIN ticket t ON t.clientFk = c.id
 					WHERE c.salesPersonFk IS NOT NULL
-						OR t.created > util.VN_CURDATE() - INTERVAL 2 MONTH 
-						OR shipped > util.VN_CURDATE() - INTERVAL 2 MONTH 
+						OR t.created > util.VN_CURDATE() - INTERVAL 12 MONTH 
+						OR shipped > util.VN_CURDATE() - INTERVAL 12 MONTH 
 				);
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/triggers/client_afterUpdate.sql b/db/routines/vn/triggers/client_afterUpdate.sql
index 481b00007d..d35a5098b6 100644
--- a/db/routines/vn/triggers/client_afterUpdate.sql
+++ b/db/routines/vn/triggers/client_afterUpdate.sql
@@ -8,7 +8,7 @@ BEGIN
 			WHERE clientFk = NEW.id;
 			
 		UPDATE `address` SET isDefaultAddress = 1
-			WHERE id = NEW.defaultAddressFk;      
+			WHERE id = NEW.defaultAddressFk;
 	END IF;
 
 	IF NOT (NEW.provinceFk <=> OLD.provinceFk) OR NOT (NEW.isVies <=> OLD.isVies) THEN
@@ -17,7 +17,7 @@ BEGIN
 				WHERE t.clientFk = NEW.id
 					AND t.refFk IS NULL;
 	END IF;
-	
+
 	IF NOT NEW.isActive THEN
 		UPDATE account.`user`
 			SET active = FALSE