diff --git a/modules/email/deliverability-test.sh b/modules/email/deliverability-test.sh
index 7abe118..7d37716 100755
--- a/modules/email/deliverability-test.sh
+++ b/modules/email/deliverability-test.sh
@@ -163,7 +163,7 @@ else
         fi
     done
 
-    if [ $listed -gt 0 ]; then
+    if [ "$listed" -gt 0 ]; then
         echo ""
         print_warning "  ⚠ Your IP is listed on $listed blacklist(s)"
         echo "    Recommendation: Use blacklist-check tool for delisting options"
diff --git a/modules/email/email-diagnostics.sh b/modules/email/email-diagnostics.sh
index 197d56c..0fbb525 100755
--- a/modules/email/email-diagnostics.sh
+++ b/modules/email/email-diagnostics.sh
@@ -371,11 +371,11 @@ if [ "$check_type" != "2" ]; then
     fi
 
     # If successful logins exist, account must exist (even if we can't find the directory)
-    if [ $account_found -eq 0 ] && [ "$auth_success" -gt 0 ]; then
+    if [ "$account_found" -eq 0 ] && [ "$auth_success" -gt 0 ]; then
         account_found=1
         print_success "Email account EXISTS (confirmed by successful logins)"
         print_warning "Note: Mailbox directory not found in standard locations"
-    elif [ $account_found -eq 1 ]; then
+    elif [ "$account_found" -eq 1 ]; then
         print_success "Email account EXISTS on this server"
 
         # Show mailbox details if we found the directory