diff --git a/app/user/user_dashboard.php b/app/user/user_dashboard.php
index f3c4da512d..33a9a57304 100644
--- a/app/user/user_dashboard.php
+++ b/app/user/user_dashboard.php
@@ -56,14 +56,14 @@ echo "<br />";
 //start the user table
 	echo "<table width=\"100%\" border=\"0\" cellpadding=\"7\" cellspacing=\"0\">\n";
 	echo "<tr>\n";
-	echo "	<th class='th' colspan='2' align='left'>".$text['title-user-information']."&nbsp;</th>\n";
+	echo "	<th class='th' colspan='2' align='left'>".$text['title-user-settings']."&nbsp;</th>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
 	echo "	<td width='20%' class=\"vncell\" style='text-align: left;'>\n";
 	echo "		".$text['label-usernname'].": \n";
 	echo "	</td>\n";
 	echo "	<td class=\"row_style1\">\n";
-	echo "		<a href='".PROJECT_PATH."/app/user/user_edit.php'>".$_SESSION["username"]."</a> \n";
+	echo "		<a href='".PROJECT_PATH."/app/user_settings/user_edit.php'>".$_SESSION["username"]."</a> \n";
 	echo "	</td>\n";
 	echo "</tr>\n";
 
diff --git a/core/menu/app_config.php b/core/menu/app_config.php
index 2fd91ae0ec..0509b07f05 100644
--- a/core/menu/app_config.php
+++ b/core/menu/app_config.php
@@ -32,7 +32,6 @@
 		$apps[$x]['menu'][0]['uuid'] = 'da3a9ab4-c28e-ea8d-50cc-e8405ac8e76e';
 		$apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
 		$apps[$x]['menu'][0]['category'] = 'internal';
-		//$apps[$x]['menu'][0]['path'] = '/core/menu/menu_list.php';
 		$apps[$x]['menu'][0]['path'] = '/core/menu/menu.php';
 
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
@@ -50,7 +49,7 @@
 		$apps[$x]['menu'][1]['uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
 		$apps[$x]['menu'][1]['parent_uuid'] = '';
 		$apps[$x]['menu'][1]['category'] = 'internal';
-		$apps[$x]['menu'][1]['path'] = '/app/user/user_dashboard.php';
+		$apps[$x]['menu'][1]['path'] = '/app/user_settings/user_dashboard.php';
 		$apps[$x]['menu'][1]['order'] = '5';
 		$apps[$x]['menu'][1]['groups'][] = 'user';
 		$apps[$x]['menu'][1]['groups'][] = 'admin';
diff --git a/login.php b/login.php
index 6a15d9d6b0..9515270289 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/user_dashboard.php";
+		$_SESSION['login']['destination']['url'] = PROJECT_PATH."/user_settings/user_dashboard.php";
 	}
 
 //add the header