diff --git a/engine/core/class/CodePressCMS.php b/engine/core/class/CodePressCMS.php
index 4901408..1623671 100644
--- a/engine/core/class/CodePressCMS.php
+++ b/engine/core/class/CodePressCMS.php
@@ -434,7 +434,7 @@ class CodePressCMS {
                     return $text; // Don't link existing links, current page title, or H1 headings
                 }
                 
-                return '<a href="?page=' . $pagePath . '" class="auto-link" title="Ga naar ' . htmlspecialchars($pageTitle) . '">' . $text . '</a>';
+                return '<a href="?page=' . $pagePath . '&lang=' . $this->currentLanguage . '" class="auto-link" title="Ga naar ' . htmlspecialchars($pageTitle) . '">' . $text . '</a>';
             };
             
             $content = preg_replace_callback($pattern, $replacement, $content);
diff --git a/guide/en.codepress.md b/guide/en.codepress.md
index 9935362..2c6fba4 100644
--- a/guide/en.codepress.md
+++ b/guide/en.codepress.md
@@ -40,7 +40,7 @@ $config = [
 
 ---
 
-## Content Management
+## Content Management {#content-management}
 
 ### File Structure
 ```
@@ -90,7 +90,7 @@ CodePress automatically creates links to other pages when you mention page names
 
 ---
 
-## Templates
+## Templates {#templates}
 
 ### Template Structure
 CodePress uses Mustache-compatible templates:
@@ -110,7 +110,7 @@ Available variables in templates:
 
 ---
 
-## Configuration
+## Configuration {#configuration}
 
 ### Basic Settings
 Edit `engine/core/config.php` for your website: