diff --git a/.htaccess b/.htaccess
index c4bcfc47fa..24dccb1414 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,6 +5,7 @@
     RewriteEngine On
     RewriteBase /
 
+    # Courses home
     RewriteCond %{QUERY_STRING} ^id_session=0
     RewriteRule ^courses/(.*)/(.*)$ web/courses/$1? [R,L]
 
@@ -15,7 +16,19 @@
 
     RewriteRule ^courses/(.*)/$ web/courses/$1? [R,L]
 
-    RewriteRule ^certificates/(.*)/$ web/courses/$1? [R,L]
+    # Certificates
+    # certificates/index.php?id=1 => web/certificates/1
+    RewriteCond %{QUERY_STRING} ^id=([0-9]*)
+    RewriteRule ^certificates/(.*)$ web/certificates/%1? [R,L]
+
+    # User profile
+    # user.php?admin => web/user/admin
+    RewriteCond %{QUERY_STRING} ^([a-z0-9A-z]*)
+    RewriteRule ^user.php?$ web/user/%1? [R,L]
+
+    # News
+    RewriteCond %{QUERY_STRING} ^id=([0-9]*)
+    RewriteRule ^news_list.php?$ web/news/%1? [R,L]
 
 
 </IfModule>
\ No newline at end of file
diff --git a/certificates/index.php b/certificates/index.php
deleted file mode 100644
index a18dc6c849..0000000000
--- a/certificates/index.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-
-//Redirects to web/certificates/X
-
-require_once '../main/inc/global.inc.php';
-$id = isset($_GET['id']) ? intval($_GET['id']) : null;
-$url = Certificate::getCertificatePublicURL($id);
-header("Location: $url");
-exit;
\ No newline at end of file
diff --git a/news_list.php b/news_list.php
deleted file mode 100644
index dc2b4a4e32..0000000000
--- a/news_list.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-
-//Temporal hack to redirect calls to the new web/index.php
-require_once 'main/inc/global.inc.php';
-$id = isset($_GET['id']) ? intval($_GET['id']) : null;
-$path = api_get_path(WEB_PUBLIC_PATH);
-header('Location: '.$path.'news/'.$id);
-exit;
\ No newline at end of file
diff --git a/user.php b/user.php
deleted file mode 100644
index f97b9234c4..0000000000
--- a/user.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-//Redirects calls to user.php?admin to web/user/admin
-require_once 'main/inc/global.inc.php';
-$path = api_get_path(WEB_PUBLIC_PATH);
-$array_keys = isset($_GET) ? array_keys($_GET) : null;
-
-if (!empty($array_keys)) {
-    $username 	= Security::remove_XSS(substr($array_keys[0], 0, 100)); // max len of an username
-    header('Location: '.$path.'user/'.$username);
-}
-exit;
\ No newline at end of file