diff --git a/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
index 8d8904f25c82..99daa93d7ace 100644
--- a/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
+++ b/content/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
@@ -167,7 +167,7 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav
 
 > ### Troubleshooting SSH agent conflicts in Windows
 >
-> In Windows environments, the native Windows OpenSSH implementation and the one included with Git for Windows (based on MSYS2/Bash) can coexist.
+> In Windows environments, the native Windows OpenSSH implementation and the one included with [Git for Windows](https://gitforwindows.org/) (based on MSYS2/Bash) can coexist.
 >
 > If you configure and save your passphrases in the Windows agent using PowerShell, Git may still prompt you for your passphrase during operations like `git push`. This can happen when Git for Windows uses its bundled `ssh.exe` (from MSYS2) instead of the Windows system OpenSSH client, and therefore can't talk to the Windows `ssh-agent` service.
 >
@@ -176,6 +176,14 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav
 > ```powershell
 > git config --global core.sshCommand "C:/Windows/System32/OpenSSH/ssh.exe"
 > ```
+>
+> You may need to specify which `ssh-keygen` binary Git should use to avoid conflicts with the binary bundled with Git for Windows. To define which binary is used, run the following command:
+> 
+> ```powershell
+> git config --global gpg.ssh.program "C:/Windows/System32/OpenSSH/ssh-keygen.exe"
+> ```
+> 
+> Alternatively, you can reinstall Git for Windows and select the **Use external OpenSSH** option during the installation process.
 
 
 {% endwindows %}