diff --git a/index.php b/index.php
index 5aaa8fb89c..d1726676c6 100644
--- a/index.php
+++ b/index.php
@@ -47,7 +47,7 @@ elseif($not_installed OR $install_called) {
 elseif(OC_USER::isLoggedIn()) {
 	if(isset($_GET["logout"]) and ($_GET["logout"])) {
 		OC_USER::logout();
-		header("Location: $WEBROOT");
+		header("Location: ".$WEBROOT.'/');
 		exit();
 	}
 	else {
diff --git a/lib/setup.php b/lib/setup.php
index 5905261f18..bdb5dcc4e2 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -23,7 +23,7 @@ if(isset($_POST['install']) AND $_POST['install']=='true') {
 		OC_TEMPLATE::printGuestPage("", "installation", $options);
 	}
 	else {
-		header("Location: $WEBROOT$SUBURI");
+		header("Location: ".$WEBROOT.'/');
 		exit();
 	}
 }