diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index b1f5f3560..180182729 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -25,6 +25,13 @@ class Dashboard extends CI_Controller
 		$this->load->model('logbooks_model');
 		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 
+		
+		if (($logbooks_locations_array[0]>-1) && (!(in_array($this->stations->find_active(),$logbooks_locations_array)))) {
+			$data['active_not_linked']=true;
+		} else {
+			$data['active_not_linked']=false;
+		}
+
 		if ($logbooks_locations_array[0] == -1) {
 			$data['linkedCount']=0;
 		} else {
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index d7f8b7ee6..4d3e130ca 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -83,6 +83,14 @@ function echo_table_col($row, $name) {
 		</div>
 	<?php } ?>
 
+	<?php if (($linkedCount > 0) && $active_not_linked) { ?>
+		<div class="alert alert-danger" role="alert">
+		<?= sprintf(
+				_pgettext("Dashboard Warning", "Your active Station Location isn't linked to your Logbook. Click %shere%s to do it."), '<u><a href="' . site_url('stationsetup') . '">', '</a></u>'
+			); ?>
+		</div>
+	<?php } ?>
+
 	<?php if ($linkedCount == 0) { ?>
 		<div class="alert alert-danger" role="alert">
 		<?= sprintf(