diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php
index 33a9a57304..c98295528a 100644
--- a/core/user_settings/user_dashboard.php
+++ b/core/user_settings/user_dashboard.php
@@ -63,7 +63,7 @@ echo "<br />";
 	echo "		".$text['label-usernname'].": \n";
 	echo "	</td>\n";
 	echo "	<td class=\"row_style1\">\n";
-	echo "		<a href='".PROJECT_PATH."/app/user_settings/user_edit.php'>".$_SESSION["username"]."</a> \n";
+	echo "		<a href='".PROJECT_PATH."/core/user_settings/user_edit.php'>".$_SESSION["username"]."</a> \n";
 	echo "	</td>\n";
 	echo "</tr>\n";
 
diff --git a/core/user_settings/user_edit.php b/core/user_settings/user_edit.php
index 7348437029..39b3e3b950 100644
--- a/core/user_settings/user_edit.php
+++ b/core/user_settings/user_edit.php
@@ -199,7 +199,7 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 
 	//redirect the browser
 		require_once "includes/header.php";
-		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/app/user/user_edit.php\">\n";
+		echo "<meta http-equiv=\"refresh\" content=\"2;url=".PROJECT_PATH."/core/user_settings/user_edit.php\">\n";
 		echo "<div align='center'>".$content_users['confirm-update']."</div>";
 		require_once "includes/footer.php";
 		return;
@@ -238,7 +238,7 @@ else {
 	echo "<td align='left' width='90%' nowrap><b>".$content_users['title']."</b></td>\n";
 	echo "<td nowrap='nowrap'>\n";
 	echo "	<input type='submit' name='submit' class='btn' value='".$content_users['button-save']."'>";
-	echo "	<input type='button' class='btn' onclick=\"window.location='".PROJECT_PATH."/index2.php'\" value='".$content_users['button-back']."'>";
+	echo "	<input type='button' class='btn' onclick=\"window.location='".$_SESSION['login']['destination']['url']."'\" value='".$content_users['button-back']."'>";
 	echo "</td>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
diff --git a/login.php b/login.php
index 9515270289..025a8a8f70 100644
--- a/login.php
+++ b/login.php
@@ -32,7 +32,7 @@ require_once "includes/require.php";
 
 //set a default login destination
 	if (strlen($_SESSION['login']['destination']['url']) == 0) {
-		$_SESSION['login']['destination']['url'] = PROJECT_PATH."/user_settings/user_dashboard.php";
+		$_SESSION['login']['destination']['url'] = PROJECT_PATH."/core/user_settings/user_dashboard.php";
 	}
 
 //add the header