diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index a7231554d..8741cbf01 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -43,6 +43,9 @@ class Dashboard extends CI_Controller
 			$data['qra'] = "none";
 		}
 
+		// We need the form_helper for the layout/messages
+		$this->load->helper('form');
+
 		$this->load->model('stations');
 		$this->load->model('setup_model');
 
diff --git a/application/controllers/User.php b/application/controllers/User.php
index a617c6389..3d355b8b4 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -865,7 +865,6 @@ class User extends CI_Controller {
 
 		} else {
 			if($this->user_model->login() == 1) {
-				$this->session->set_flashdata('notice', __("User logged in"));
 				$this->user_model->update_session($data['user']->user_id);
 				$cookie= array(
 
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index c426f7352..793456227 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -125,8 +125,9 @@ function echo_table_col($row, $name) {
 			</div>
 		<?php } ?>
 	<?php } ?>
-
+	
 <?php } ?>
+<?php $this->load->view('layout/messages'); ?>
 </div>
 
 <?php if($dashboard_map != "false" && $dashboard_map != "map_at_right") { ?>