diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
index b987eb83..ef8503e7 100644
--- a/.github/workflows/issues.yml
+++ b/.github/workflows/issues.yml
@@ -189,7 +189,7 @@ jobs:
           echo "TTDLURL=${TTDLURL}" >> $GITHUB_ENV
 
       - name: Send mail
-        if: env.iscustom == 'true' && success()
+        if: env.iscustom == 'true' && success() && env.EMAIL != 'null'
         uses: dawidd6/action-send-mail@v3
         with:
           server_address: smtp-mail.outlook.com
@@ -203,7 +203,7 @@ jobs:
             ${{ env.TTDLURL }}
 
       - name: Update Comment Success
-        if: env.iscustom == 'true' && success()
+        if: env.iscustom == 'true' && success() && env.EMAIL != 'null'
         uses: actions-cool/issues-helper@v3
         with:
           actions: 'update-comment'
@@ -217,6 +217,21 @@ jobs:
             ----
           emoji: hooray
 
+      - name: Update Comment Success
+        if: env.iscustom == 'true' && success() && env.EMAIL == 'null'
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'update-comment'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          comment-id: ${{ steps.comment.outputs.comment-id }}
+          update-mode: replace
+          body: |
+            Hi @${{ github.event.issue.user.login }}.  
+            ${{ env.TTDLURL }}
+            > ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}  
+            ----
+          emoji: hooray
+
       - name: Update Comment Fail
         if: env.iscustom == 'true' && failure()
         uses: actions-cool/issues-helper@v3