diff --git a/web/src/pages/PullRequest/Conversation/Conversation.tsx b/web/src/pages/PullRequest/Conversation/Conversation.tsx
index e60222c6c..ec6ce8e10 100644
--- a/web/src/pages/PullRequest/Conversation/Conversation.tsx
+++ b/web/src/pages/PullRequest/Conversation/Conversation.tsx
@@ -196,7 +196,7 @@ export const Conversation: React.FC<ConversationProps> = ({
         boxClassName={css.commentBox}
         editorClassName={css.commentEditor}
         commentItems={[]}
-        currentUserName={currentUser.display_name}
+        currentUserName={currentUser.display_name || currentUser.email || ''}
         resetOnSave
         hideCancel={false}
         setDirty={setDirtyNewComment}
diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
index 542ec2505..94f31767b 100644
--- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
+++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
@@ -135,9 +135,13 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
         })
     }
   }
+
   useEffect(() => {
-    dryMerge() // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
+    // recheck PR in case source SHA changed or PR was marked as unchecked
+    // TODO: optimize call to handle all causes and avoid double calls by keeping track of SHA
+    dryMerge()
+  }, [unchecked, pullRequestMetadata?.source_sha]) // eslint-disable-next-line react-hooks/exhaustive-deps
+
   useEffect(() => {
     // dryMerge()
     const intervalId = setInterval(async () => {
@@ -208,6 +212,7 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
       setMergeOption(mergeOptions[3])
     } // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [allowedStrats])
+
   const [draftOption, setDraftOption] = useState<PRDraftOption>(draftOptions[0])
   const permPushResult = hooks?.usePermissionTranslate?.(
     {