1 files changed, 3 insertions, 2 deletions
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java b/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
index ecc6b212b..9b30acd61 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
@@ -240,8 +240,9 @@ public class RequestCompletePanel extends CMSBaseTab implements ItemListener {
 		String emailSubject = mEmailSubjectText.getText().trim();
         String senderEmail = mSenderEmailText.getText().trim();
 
-        if (emailForm.equals("") || senderEmail.equals("") ||
-			   emailSubject.equals("")) {
+        if (mEnable.isSelected() && (emailForm.equals("") ||
+                                     senderEmail.equals("") ||
+                                     emailSubject.equals(""))) {
             showMessageDialog("BLANKFIELD");
             return false;
         }