diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index 1f8c1421f..e315a4cab 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -67,10 +67,10 @@ class Dashboard extends CI_Controller {
 		$data['current_active'] = $this->stations->find_active();
 
 		$data['themesWithoutMode'] = $this->setup_model->checkThemesWithoutMode();
-		if (($this->optionslib->get_option('dashboard_map') == 'true') && (($this->session->userdata('user_dashboard_map') ?? 'Y') == 'Y')) {
-			$data['dashboard_map'] = $this->optionslib->get_option('dashboard_map');
+		if (($this->session->userdata('user_dashboard_map') ?? '') != '') {
+			$data['dashboard_map'] = $this->session->userdata('user_dashboard_map') ?? 'Y';
 		} else {
-			$data['dashboard_map'] = 'false';
+			$data['dashboard_map'] = 'N';
 		}
 
 		$data['user_map_custom'] = $this->optionslib->get_map_custom();
diff --git a/application/controllers/Options.php b/application/controllers/Options.php
index 30c247a63..520950979 100644
--- a/application/controllers/Options.php
+++ b/application/controllers/Options.php
@@ -94,14 +94,6 @@ class Options extends CI_Controller {
 				$this->session->set_flashdata('success', __("Options saved"));
 			}
 
-			// Update dashboard map within the options system
-			$dashboard_map_update_status = $this->optionslib->update('dashboard_map', $this->input->post('dashboardMap'), 'yes');
-
-			// If dashboard map update is complete set a flashsession with a success note
-			if($dashboard_map_update_status == TRUE) {
-				$this->session->set_flashdata('success', __("Options saved"));
-			}
-
 			// Update logbook map within the options system
 			$logbook_map_update_status = $this->optionslib->update('logbook_map', $this->input->post('logbookMap'), 'yes');
 
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 83f38eade..23209026b 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -203,7 +203,7 @@ function getDistance($distance) {
 <?php $this->load->view('layout/messages'); ?>
 </div>
 
-<?php if($dashboard_map != "false" && $dashboard_map != "map_at_right") { ?>
+<?php if($dashboard_map != "N" && $dashboard_map != "map_at_right") { ?>
 <!-- Map -->
 <div id="map" class="map-leaflet" style="width: 100%; height: 350px"></div>
 <?php } ?>
diff --git a/application/views/options/appearance.php b/application/views/options/appearance.php
index e05dfc9f8..4c4de9b6c 100644
--- a/application/views/options/appearance.php
+++ b/application/views/options/appearance.php
@@ -66,16 +66,6 @@
                             <small id="dashboardBannerHelp" class="form-text text-muted"><?= __("This allows to disable the global notification banner on the dashboard."); ?></small>
                         </div>
 
-                        <div class="mb-3">
-                            <label for="dashboardMap"><?= __("Dashboard Map"); ?></label>
-                            <select class="form-select" id="dashboardMap" name="dashboardMap" aria-describedby="dashboardMapHelp" required>
-                                <option value='true' <?php if($this->optionslib->get_option('dashboard_map') == "true") { echo "selected=\"selected\""; } ?>><?= __("Enabled"); ?></option>
-                                <option value='false' <?php if($this->optionslib->get_option('dashboard_map') == "false") { echo "selected=\"selected\""; } ?>><?= __("Disabled"); ?></option>
-                                <option value='map_at_right' <?php if($this->optionslib->get_option('dashboard_map') == "map_at_right") { echo "selected=\"selected\""; } ?>><?= __("Map at right"); ?></option>
-                            </select>
-                            <small id="dashboardMapHelp" class="form-text text-muted"><?= __("This allows the map on the dashboard to be disabled or placed on the right."); ?></small>
-                        </div>
-
                         <div class="mb-3">
                             <label for="logbookMap"><?= __("Logbook Map"); ?></label>
                             <select class="form-select" id="logbookMap" name="logbookMap" aria-describedby="logbookMapHelp" required>
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index 3433e000e..159dc6575 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -232,6 +232,7 @@
 										<?php if(!isset($user_dashboard_map)) { $user_dashboard_map='Y'; }?>
 										<select class="form-select" id="user_dashboard_map" name="user_dashboard_map" aria-describedby="user_dashboard_map_Help" required>
 											<option value='Y' <?php if($user_dashboard_map == "Y") { echo "selected=\"selected\""; } ?>><?= __("Yes"); ?></option>
+											<option value='map_at_right' <?php if($user_dashboard_map == "map_at_right") { echo "selected=\"selected\""; } ?>><?= __("Map at right"); ?></option>
 											<option value='N' <?php if($user_dashboard_map == "N") { echo "selected=\"selected\""; } ?>><?= __("No"); ?></option>
 										</select>
 										<small id="user_dashboard_map_Help" class="form-text text-muted"><?= __("Choose whether to show map on dashboard or not"); ?></small>