diff --git a/admin/system.php b/admin/system.php
index da77027f7aa315baf85513a5997f079a9b7933ef..42ae8a6c2d10a451b93c86d928c1073a5e96e516 100644
--- a/admin/system.php
+++ b/admin/system.php
@@ -23,7 +23,7 @@
 
 require_once('../lib/base.php');
 if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
 	exit();
 }
 
diff --git a/admin/users.php b/admin/users.php
index b120e10d437f193f7b6255d67fae549a31342527..cbec28a544b2be46ec150acaee3f39e96a57e6b7 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -23,7 +23,7 @@
 
 require_once('../lib/base.php');
 if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
 	exit();
 }
 
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index cae3542a65be96cdbbed624ceb79db5314aab357..696b95c37e0bd547028bb1b9369104c5c671f40a 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -24,7 +24,7 @@
 require_once('../../lib/base.php');
 
 if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( '', "index.php" ));
 	exit();
 }
 
diff --git a/files/admin.php b/files/admin.php
index 7161de6e196fb8e961c1d0ba025aec26bfab732e..db47bc7c033584cf5fa40f319a99dc0d4580dcce 100644
--- a/files/admin.php
+++ b/files/admin.php
@@ -28,7 +28,7 @@ require_once('../lib/base.php');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "files", "index.php" ));
 	exit();
 }
 
diff --git a/files/ajax/download.php b/files/ajax/download.php
index 2bbf1df4ecace9c62d576cc9dfc10bc3a997a93c..4c756f9b1905570f7900cea78a3a9f15a59beff1 100644
--- a/files/ajax/download.php
+++ b/files/ajax/download.php
@@ -26,7 +26,7 @@ require_once('../../lib/base.php');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
 	exit();
 }
 
diff --git a/files/download.php b/files/download.php
index cc52b930f7230876ec766559a90f62df7578278c..ccd3eb43d8e7bac556c2d274823ab5f624f671f5 100644
--- a/files/download.php
+++ b/files/download.php
@@ -26,7 +26,7 @@ require_once('../lib/base.php');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
 	exit();
 }
 
diff --git a/files/settings.php b/files/settings.php
index 1f2e9d9868cc63fcd090b506f3305648094ffbe4..2bbcb2acd3aec2e178fa165339e4845d449c11d6 100644
--- a/files/settings.php
+++ b/files/settings.php
@@ -27,7 +27,7 @@ require_once('../lib/base.php');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
 	exit();
 }
 
diff --git a/help/index.php b/help/index.php
index 642b2131737132ae68c0038aa524b287970f8f85..7eb0c6b1820ca5297ea97638ef9aa93534970251 100644
--- a/help/index.php
+++ b/help/index.php
@@ -2,7 +2,7 @@
 
 require_once('../lib/base.php');
 if( !OC_User::isLoggedIn()){
-    header( "Location: ".OC_Helper::linkTo( "index.php" ));
+    header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
     exit();
 }
 
diff --git a/settings/index.php b/settings/index.php
index 9669b5b3dbaa7e49677ad28f99b4c01eddfc7d4e..aea35054930f198eba2231e2817dab07ef12fa2b 100644
--- a/settings/index.php
+++ b/settings/index.php
@@ -2,7 +2,7 @@
 
 require_once('../lib/base.php');
 if( !OC_User::isLoggedIn()){
-    header( "Location: ".OC_Helper::linkTo( "index.php" ));
+    header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
     exit();
 }