diff --git a/application/controllers/User.php b/application/controllers/User.php
index 9a5b881d..ac447cf9 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -695,6 +695,7 @@ class User extends CI_Controller {
 			if($this->user_model->login() == 1) {
 				$this->session->set_flashdata('notice', 'User logged in');
 				$this->user_model->update_session($data['user']->user_id);
+				$this->user_model->set_last_login($data['user']->user_id);
 				$cookie= array(
 
 					'name'   => 'language',
diff --git a/application/models/User_model.php b/application/models/User_model.php
index 7a7d5b6e..57c97a05 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -423,6 +423,16 @@ class User_Model extends CI_Model {
 		return 0;
 	}
 
+	// FUNCTION: set's the last-login timestamp in user table
+	function set_last_login($user_id) {
+		$data = array(
+			'last_login_date' => date('Y-m-d H:i:s')
+		);
+		
+		$this->db->where('user_id', $user_id);
+		$this->db->update('users', $data);
+	}
+
 	// FUNCTION: bool authorize($level)
 	// Checks a user's level of access against the given $level
 	function authorize($level) {