diff --git a/core/dashboard/index.php b/core/dashboard/index.php
index 2a01ab08d5..2b19aa7bc8 100644
--- a/core/dashboard/index.php
+++ b/core/dashboard/index.php
@@ -246,7 +246,7 @@
 	echo "	<div class='actions'>\n";
 	echo "		<form id='dashboard' method='post' _onsubmit='setFormSubmitting()'>\n";
 	if ($settings->get('theme', 'menu_style', '') != 'side') {
-		echo "		".$text['label-welcome']." <a href='".PROJECT_PATH."/core/users/user_edit.php?id=user'>".$_SESSION["username"]."</a>&nbsp; &nbsp;";
+		echo "		".$text['label-welcome']." <a href='".PROJECT_PATH."/core/users/user_profile.php'>".$_SESSION["username"]."</a>&nbsp; &nbsp;";
 	}
 	if (permission_exists('dashboard_edit')) {
 		echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','name'=>'btn_back','style'=>'display: none;','onclick'=>"edit_mode('off');"]);
diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index 2cb589455d..d5791dd40d 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -109,33 +109,6 @@ $text['description-users']['zh-cn'] = "增加、编辑、删除和搜索用户
 $text['description-users']['ja-jp'] = "ユーザの追加、編集、削除、検索を行います。";
 $text['description-users']['ko-kr'] = "추가, 편집, 삭제 및 검색 사용자.";
 
-$text['title-user_profile']['en-us'] = "User Profile";
-$text['title-user_profile']['en-gb'] = "User Profile";
-$text['title-user_profile']['ar-eg'] = "ملف المستخدم";
-$text['title-user_profile']['de-at'] = "Benutzerprofil";
-$text['title-user_profile']['de-ch'] = "Benutzerprofil";
-$text['title-user_profile']['de-de'] = "Benutzerprofil";
-$text['title-user_profile']['el-gr'] = "Προφίλ Προσώπου";
-$text['title-user_profile']['es-cl'] = "Perfil del Usuario";
-$text['title-user_profile']['es-mx'] = "Perfil del Usuario";
-$text['title-user_profile']['fr-ca'] = "Profil de l'Utilisateur";
-$text['title-user_profile']['fr-fr'] = "Profil de l'Utilisateur";
-$text['title-user_profile']['he-il'] = "פרופיל משתמש";
-$text['title-user_profile']['it-it'] = "Profilo dell'Utente";
-$text['title-user_profile']['ka-ge'] = "მომხმარებლის პროფილი";
-$text['title-user_profile']['nl-nl'] = "Gebruikersprofiel";
-$text['title-user_profile']['pl-pl'] = "Profil Użytkownika";
-$text['title-user_profile']['pt-br'] = "Perfil do Usuário";
-$text['title-user_profile']['pt-pt'] = "Perfil do Usuário";
-$text['title-user_profile']['ro-ro'] = "Profil de utilizator";
-$text['title-user_profile']['ru-ru'] = "Профиль пользователя";
-$text['title-user_profile']['sv-se'] = "Användarprofil";
-$text['title-user_profile']['uk-ua'] = "Профіль користувача";
-$text['title-user_profile']['tr-tr'] = "Kullanıcı Profili";
-$text['title-user_profile']['zh-cn'] = "用户资料";
-$text['title-user_profile']['ja-jp'] = "ユーザープロフィール";
-$text['title-user_profile']['ko-kr'] = "사용자 프로필";
-
 $text['description-user_profile']['en-us'] = "You can use your account profile to update your email address, password, or to other profile settings.";
 $text['description-user_profile']['en-gb'] = "You can use your account profile to update your email address, password, or to other profile settings.";
 $text['description-user_profile']['ar-eg'] = "يمكنك استخدام ملف الملف الشخصي لحسابك لتعديل عنوان البريد الإلكتروني، كلمة المرور، أو أي إعدادات ملف أخرى.";
diff --git a/core/users/resources/dashboard/config.php b/core/users/resources/dashboard/config.php
index a612fb73b6..3ec50dc1b1 100644
--- a/core/users/resources/dashboard/config.php
+++ b/core/users/resources/dashboard/config.php
@@ -45,14 +45,14 @@ $array['dashboard_widgets'][$x]['dashboard_widget_groups'][$y]['dashboard_widget
 $array['dashboard_widgets'][$x]['dashboard_widget_groups'][$y]['group_name'] = 'admin';
 $x++;
 
-//account settings icon
+//user profile icon
 $array['dashboard_widgets'][$x]['dashboard_uuid'] = '3e2cbaa4-2bec-41b2-a626-999a59b8b19c';
 $array['dashboard_widgets'][$x]['dashboard_widget_uuid'] = '8aa9bb66-7a62-4a90-b52e-68bd4ccf325f';
 $array['dashboard_widgets'][$x]['widget_name'] = 'Account Settings';
 $array['dashboard_widgets'][$x]['widget_path'] = 'dashboard/icon';
 $array['dashboard_widgets'][$x]['widget_icon'] = 'fa-solid fa-user-gear';
 $array['dashboard_widgets'][$x]['widget_icon_color'] = '#0292FF';
-$array['dashboard_widgets'][$x]['widget_url'] = '/core/users/user_edit.php?id=user';
+$array['dashboard_widgets'][$x]['widget_url'] = '/core/users/user_profile.php';
 $array['dashboard_widgets'][$x]['widget_target'] = 'self';
 $array['dashboard_widgets'][$x]['widget_width'] = '';
 $array['dashboard_widgets'][$x]['widget_height'] = '';
diff --git a/resources/app_languages.php b/resources/app_languages.php
index 7870fa0e91..865fe4eb3a 100644
--- a/resources/app_languages.php
+++ b/resources/app_languages.php
@@ -6311,32 +6311,32 @@ $text['title-logout']['zh-cn'] = "登出";
 $text['title-logout']['ja-jp'] = "ログアウト";
 $text['title-logout']['ko-kr'] = "로그아웃";
 
-$text['title-account_settings']['en-us'] = "Account Settings";
-$text['title-account_settings']['en-gb'] = "Account Settings";
-$text['title-account_settings']['ar-eg'] = "إعدادات الحساب";
-$text['title-account_settings']['de-at'] = "Kontoeinstellungen";
-$text['title-account_settings']['de-ch'] = "Kontoeinstellungen";
-$text['title-account_settings']['de-de'] = "Kontoeinstellungen";
-$text['title-account_settings']['el-gr'] = "Ρυθμίσεις λογαριασμού";
-$text['title-account_settings']['es-cl'] = "Configuración de Cuenta";
-$text['title-account_settings']['es-mx'] = "Configuración de Cuenta";
-$text['title-account_settings']['fr-ca'] = "Paramètres du compte";
-$text['title-account_settings']['fr-fr'] = "Personalisation du compte";
-$text['title-account_settings']['he-il'] = "הגדרת חשבון";
-$text['title-account_settings']['it-it'] = "Parametri Account";
-$text['title-account_settings']['ka-ge'] = "ანგარიშის პარამეტრები";
-$text['title-account_settings']['nl-nl'] = "Accountinstellingen";
-$text['title-account_settings']['pl-pl'] = "Ustawienia konta";
-$text['title-account_settings']['pt-br'] = "Configurações da conta";
-$text['title-account_settings']['pt-pt'] = "Configurações de Conta";
-$text['title-account_settings']['ro-ro'] = "Setări cont";
-$text['title-account_settings']['ru-ru'] = "Настройки учетной записи";
-$text['title-account_settings']['sv-se'] = "Kontoinställningar";
-$text['title-account_settings']['uk-ua'] = "Параметри облікового запису";
-$text['title-account_settings']['tr-tr'] = "Hesap ayarları";
-$text['title-account_settings']['zh-cn'] = "账户设置";
-$text['title-account_settings']['ja-jp'] = "アカウント設定";
-$text['title-account_settings']['ko-kr'] = "계정 설정";
+$text['title-user_profile']['en-us'] = "User Profile";
+$text['title-user_profile']['en-gb'] = "User Profile";
+$text['title-user_profile']['ar-eg'] = "ملف المستخدم";
+$text['title-user_profile']['de-at'] = "Benutzerprofil";
+$text['title-user_profile']['de-ch'] = "Benutzerprofil";
+$text['title-user_profile']['de-de'] = "Benutzerprofil";
+$text['title-user_profile']['el-gr'] = "Προφίλ Προσώπου";
+$text['title-user_profile']['es-cl'] = "Perfil del Usuario";
+$text['title-user_profile']['es-mx'] = "Perfil del Usuario";
+$text['title-user_profile']['fr-ca'] = "Profil de l'Utilisateur";
+$text['title-user_profile']['fr-fr'] = "Profil de l'Utilisateur";
+$text['title-user_profile']['he-il'] = "פרופיל משתמש";
+$text['title-user_profile']['it-it'] = "Profilo dell'Utente";
+$text['title-user_profile']['ka-ge'] = "მომხმარებლის პროფილი";
+$text['title-user_profile']['nl-nl'] = "Gebruikersprofiel";
+$text['title-user_profile']['pl-pl'] = "Profil Użytkownika";
+$text['title-user_profile']['pt-br'] = "Perfil do Usuário";
+$text['title-user_profile']['pt-pt'] = "Perfil do Usuário";
+$text['title-user_profile']['ro-ro'] = "Profil de utilizator";
+$text['title-user_profile']['ru-ru'] = "Профиль пользователя";
+$text['title-user_profile']['sv-se'] = "Användarprofil";
+$text['title-user_profile']['uk-ua'] = "Профіль користувача";
+$text['title-user_profile']['tr-tr'] = "Kullanıcı Profili";
+$text['title-user_profile']['zh-cn'] = "用户资料";
+$text['title-user_profile']['ja-jp'] = "ユーザープロフィール";
+$text['title-user_profile']['ko-kr'] = "사용자 프로필";
 
 $text['option-expanded']['en-us'] = "Expanded";
 $text['option-expanded']['ka-ge'] = "გაფართოებული";
diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index d83f0950d2..9adc3f823c 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -1329,7 +1329,7 @@
 						$html .= "		<div class='mt-2' style='font-size: 90%;'><i class='fa-solid fa-phone' style='margin-right: 5px; color: #00b043;'></i><strong>".$_SESSION['user']['extension'][0]['destination']."</strong></div>\n";
 					}
 					$html .= "			<div class='pt-2 mt-3' style='border-top: 1px solid ".color_adjust($this->settings->get('theme', 'body_header_shadow_color'), 0.05).";'>\n";
-					$html .= "				<a href='".PROJECT_PATH."/core/users/user_edit.php?id=user'>".$this->text['title-account_settings']."</a><br>\n";
+					$html .= "				<a href='".PROJECT_PATH."/core/users/user_profile.php'>".$this->text['title-user_profile']."</a><br>\n";
 					$html .= "				<a href='".PROJECT_PATH."/logout.php'>".$this->text['title-logout']."</a>\n";
 					$html .= "			</div>";
 					$html .= "		</div>";
@@ -1462,7 +1462,7 @@
 					$html .= "		<div class='mt-2' style='font-size: 90%;'><i class='fa-solid fa-phone' style='margin-right: 5px; color: #00b043;'></i><strong>".$_SESSION['user']['extension'][0]['destination']."</strong></div>\n";
 				}
 				$html .= "			<div class='pt-2 mt-3' style='border-top: 1px solid ".color_adjust($this->settings->get('theme', 'body_header_shadow_color'), 0.05).";'>\n";
-				$html .= "				<a href='".PROJECT_PATH."/core/users/user_edit.php?id=user'>".$this->text['title-account_settings']."</a><br>\n";
+				$html .= "				<a href='".PROJECT_PATH."/core/users/user_profile.php'>".$this->text['title-user_profile']."</a><br>\n";
 				$html .= "				<a href='".PROJECT_PATH."/logout.php'>".$this->text['title-logout']."</a>\n";
 				$html .= "			</div>";
 				$html .= "		</div>";