diff --git a/.htaccess b/.htaccess
index b33f9ed..c459c4d 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +1,7 @@
     RewriteEngine On
     RewriteRule ^$           main  [QSA]
     RewriteRule ^index\.php$ wiki.php?page=main  [QSA]
+    RewriteRule ^users$ includes/users.php [QSA,L]
+    RewriteRule ^server$ includes/server.php [QSA,L]
     RewriteCond %{REQUEST_URI} !(/includes/|/media/|tilde.json|humans.txt|/webmail/|/favicon.ico|/~)
     RewriteRule ^([^\d]+)/?$ wiki.php?page=$1 [QSA]
diff --git a/includes/sidebar.md b/includes/sidebar.md
index 4b2eee7..eb7f92f 100644
--- a/includes/sidebar.md
+++ b/includes/sidebar.md
@@ -15,9 +15,9 @@
     ---------------------------
 
     -   [Wiki](https://wiki.thunix.net/)
-    -   [Status of thunix Servers and Services](/includes/server.php)
+    -   [Status of thunix Servers and Services](/server)
     -   [Service News](/news)
-    -   [User Web Directories](/includes/users.php)
+    -   [User Web Directories](/users)
     -   [User Gopher Directories](https://gopher.tildeverse.org/thunix.net)
     -   [Web Mail](/webmail/)
     -   [ZNC Service](https://thunix.net:1326/)