diff --git a/check_login.php b/check_login.php
index f6ca6b69..9e277e69 100644
--- a/check_login.php
+++ b/check_login.php
@@ -44,8 +44,6 @@ if ($session_user_role == 3) {
 }
 $session_user_config_force_mfa = intval($row['user_config_force_mfa']);
 $user_config_records_per_page = intval($row['user_config_records_per_page']);
-$user_config_dashboard_financial_enable = intval($row['user_config_dashboard_financial_enable']);
-$user_config_dashboard_technical_enable = intval($row['user_config_dashboard_technical_enable']);
 
 $sql = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE settings.company_id = companies.company_id AND companies.company_id = 1");
 $row = mysqli_fetch_array($sql);
diff --git a/dashboard.php b/dashboard.php
index 09c2fda4..7adfbedd 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -7,18 +7,22 @@ if (isset($_GET['year'])) {
     $year = date('Y');
 }
 
-if (isset($_GET['enable_financial']) == 1) {
-    mysqli_query($mysqli, "UPDATE user_settings SET user_config_dashboard_financial_enable = 1 WHERE user_id = $session_user_id");
-} else {
-     mysqli_query($mysqli, "UPDATE user_settings SET user_config_dashboard_financial_enable = 0 WHERE user_id = $session_user_id");
+if (isset($_GET['enable_financial'])) {
+    $enable_financial = intval($_GET['enable_financial']);
+    mysqli_query($mysqli, "UPDATE user_settings SET user_config_dashboard_financial_enable = $enable_financial WHERE user_id = $session_user_id");
 }
 
-if (isset($_GET['enable_technical']) == 1) {
-    mysqli_query($mysqli, "UPDATE user_settings SET user_config_dashboard_technical_enable = 1 WHERE user_id = $session_user_id");
-} else {
-     mysqli_query($mysqli, "UPDATE user_settings SET user_config_dashboard_technical_enable = 0 WHERE user_id = $session_user_id");
+if (isset($_GET['enable_technical'])) {
+    $enable_technical = intval($_GET['enable_technical']);
+    mysqli_query($mysqli, "UPDATE user_settings SET user_config_dashboard_technical_enable = $enable_technical WHERE user_id = $session_user_id");
 }
 
+// Fetch User Dashboard Settings
+$sql_user_dashboard_settings = mysqli_query($mysqli, "SELECT * FROM user_settings WHERE user_id = $session_user_id");
+$row = mysqli_fetch_array($sql_user_dashboard_settings);
+$user_config_dashboard_financial_enable = intval($row['user_config_dashboard_financial_enable']);
+$user_config_dashboard_technical_enable = intval($row['user_config_dashboard_technical_enable']);
+
 //GET unique years from expenses, payments invoices and revenues
 $sql_years_select = mysqli_query(
     $mysqli,
@@ -35,6 +39,8 @@ $sql_years_select = mysqli_query(
 ?>
 
 <form class="form-inline">
+    <input type="hidden" name="enable_financial" value="0">
+    <input type="hidden" name="enable_technical" value="0">
 
     <select onchange="this.form.submit()" class="form-control mb-3 mr-sm-3 col-sm-2" name="year">
         <?php