diff --git a/ehcp/ehcpforceupdate.sh b/ehcp/ehcpforceupdate.sh
index af01f1b..b3bda8d 100755
--- a/ehcp/ehcpforceupdate.sh
+++ b/ehcp/ehcpforceupdate.sh
@@ -2867,7 +2867,7 @@ function fixQuotaForEmailsPostfix3x(){
 	if [ -e "$mailLimitFile" ]; then
 		hasQueryInMailboxLimitFile=$(cat "$mailLimitFile" | grep -o "query")
 		if [ ! -z "$hasQueryInMailboxLimitFile" ]; then
-			sed -i "s/^query/query = SELECT quota*1048576 FROM emailusers WHERE email='%s'/g" "$mailLimitFile"
+			sed -i "s/^query.*/query = SELECT quota*1048576 FROM emailusers WHERE email='%s'/g" "$mailLimitFile"
 		else
 			echo -e "query = SELECT quota*1048576 FROM emailusers WHERE email='%s'" >> "$mailLimitFile"
 		fi
diff --git a/ehcp/install_main.sh b/ehcp/install_main.sh
index d6a2146..f59d063 100755
--- a/ehcp/install_main.sh
+++ b/ehcp/install_main.sh
@@ -2598,7 +2598,7 @@ function fixQuotaForEmailsPostfix3x(){
 	if [ -e "$mailLimitFile" ]; then
 		hasQueryInMailboxLimitFile=$(cat "$mailLimitFile" | grep -o "query")
 		if [ ! -z "$hasQueryInMailboxLimitFile" ]; then
-			sed -i "s/^query/query = SELECT quota*1048576 FROM emailusers WHERE email='%s'/g" "$mailLimitFile"
+			sed -i "s/^query.*/query = SELECT quota*1048576 FROM emailusers WHERE email='%s'/g" "$mailLimitFile"
 		else
 			echo -e "query = SELECT quota*1048576 FROM emailusers WHERE email='%s'" >> "$mailLimitFile"
 		fi