diff --git a/application/config/migration.php b/application/config/migration.php
index 9960027bc..0fec41afc 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
 |
 */
 
-$config['migration_version'] = 169;
+$config['migration_version'] = 170;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/controllers/User.php b/application/controllers/User.php
index 9f04b8be2..b44cbd2d8 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -695,7 +695,6 @@ 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/language/bulgarian/admin_lang.php b/application/language/bulgarian/admin_lang.php
index 2f4550e14..6346ae857 100644
--- a/application/language/bulgarian/admin_lang.php
+++ b/application/language/bulgarian/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'User List';
 $lang['admin_user'] = 'User';
 $lang['admin_email'] = 'E-mail';
 $lang['admin_type'] = 'Type';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Options';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/chinese_simplified/admin_lang.php b/application/language/chinese_simplified/admin_lang.php
index c5fe9df93..0ea6ddde3 100644
--- a/application/language/chinese_simplified/admin_lang.php
+++ b/application/language/chinese_simplified/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = '用户列表';
 $lang['admin_user'] = '用户名';
 $lang['admin_email'] = '电子邮件';
 $lang['admin_type'] = '用户类型';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = '设置';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/czech/admin_lang.php b/application/language/czech/admin_lang.php
index 80adfeb84..df615ae56 100644
--- a/application/language/czech/admin_lang.php
+++ b/application/language/czech/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'Seznam uživatelů';
 $lang['admin_user'] = 'Uživatel';
 $lang['admin_email'] = 'E-mail';
 $lang['admin_type'] = 'Typ';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Možnosti';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/dutch/admin_lang.php b/application/language/dutch/admin_lang.php
index 9d0bffe00..5c9385f2c 100644
--- a/application/language/dutch/admin_lang.php
+++ b/application/language/dutch/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'User List';
 $lang['admin_user'] = 'User';
 $lang['admin_email'] = 'E-mail';
 $lang['admin_type'] = 'Type';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Options';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php
index 6fdf68f62..dc3d0257b 100644
--- a/application/language/english/admin_lang.php
+++ b/application/language/english/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'User List';
 $lang['admin_user'] = 'User';
 $lang['admin_email'] = 'E-mail';
 $lang['admin_type'] = 'Type';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Options';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/finnish/admin_lang.php b/application/language/finnish/admin_lang.php
index d0f1ffa4c..02e2b9127 100644
--- a/application/language/finnish/admin_lang.php
+++ b/application/language/finnish/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'Käyttäjälista';
 $lang['admin_user'] = 'Käyttäjä';
 $lang['admin_email'] = 'E-mail';
 $lang['admin_type'] = 'Rooli';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Valinnat';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/french/admin_lang.php b/application/language/french/admin_lang.php
index 8a64cfff1..90529a104 100644
--- a/application/language/french/admin_lang.php
+++ b/application/language/french/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = "Liste des utilisateurs";
 $lang['admin_user'] = "Utilisateur";
 $lang['admin_email'] = "E-mail";
 $lang['admin_type'] = "Type";
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = "Options";
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/german/admin_lang.php b/application/language/german/admin_lang.php
index edcf72f66..df7213e0b 100644
--- a/application/language/german/admin_lang.php
+++ b/application/language/german/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'Benutzer Liste';
 $lang['admin_user'] = 'Benutzer';
 $lang['admin_email'] = 'E-Mail';
 $lang['admin_type'] = 'Typ';
-$lang['admin_last_login'] = "Letzter Login";
+$lang['admin_last_seen'] = "Zuletzt gesehen";
 $lang['admin_options'] = 'Optionen';
 
 $lang['admin_station_logbooks'] = 'Logbücher';
diff --git a/application/language/greek/admin_lang.php b/application/language/greek/admin_lang.php
index 6fdf68f62..dc3d0257b 100644
--- a/application/language/greek/admin_lang.php
+++ b/application/language/greek/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'User List';
 $lang['admin_user'] = 'User';
 $lang['admin_email'] = 'E-mail';
 $lang['admin_type'] = 'Type';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Options';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/italian/admin_lang.php b/application/language/italian/admin_lang.php
index 6fdf68f62..dc3d0257b 100644
--- a/application/language/italian/admin_lang.php
+++ b/application/language/italian/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'User List';
 $lang['admin_user'] = 'User';
 $lang['admin_email'] = 'E-mail';
 $lang['admin_type'] = 'Type';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Options';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/polish/admin_lang.php b/application/language/polish/admin_lang.php
index 6fdf68f62..dc3d0257b 100644
--- a/application/language/polish/admin_lang.php
+++ b/application/language/polish/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'User List';
 $lang['admin_user'] = 'User';
 $lang['admin_email'] = 'E-mail';
 $lang['admin_type'] = 'Type';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Options';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/russian/admin_lang.php b/application/language/russian/admin_lang.php
index cf0e9a06e..522f62d23 100644
--- a/application/language/russian/admin_lang.php
+++ b/application/language/russian/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'Список пользователей';
 $lang['admin_user'] = 'Пользователь';
 $lang['admin_email'] = 'Емэйл';
 $lang['admin_type'] = 'Роль';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Опции';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/spanish/admin_lang.php b/application/language/spanish/admin_lang.php
index a4f4de05d..89f7b8a2e 100644
--- a/application/language/spanish/admin_lang.php
+++ b/application/language/spanish/admin_lang.php
@@ -11,6 +11,7 @@ $lang['admin_user_list'] = 'Lista de Usuarios';
 $lang['admin_user'] = 'Usuario';
 $lang['admin_email'] = 'Email';
 $lang['admin_type'] = 'Tipo';
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Opciones';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/swedish/admin_lang.php b/application/language/swedish/admin_lang.php
index 6df015c3e..0d617a80d 100644
--- a/application/language/swedish/admin_lang.php
+++ b/application/language/swedish/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'Användarlista';
 $lang['admin_user'] = 'Användare';
 $lang['admin_email'] = 'E-post';
 $lang['admin_type'] = 'Typ';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Alternativ';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/language/turkish/admin_lang.php b/application/language/turkish/admin_lang.php
index 1661c5a0d..c35c6b1fb 100644
--- a/application/language/turkish/admin_lang.php
+++ b/application/language/turkish/admin_lang.php
@@ -12,7 +12,7 @@ $lang['admin_user_list'] = 'User List';
 $lang['admin_user'] = 'User';
 $lang['admin_email'] = 'E-mail';
 $lang['admin_type'] = 'Type';
-$lang['admin_last_login'] = "Last Login";
+$lang['admin_last_seen'] = "Last seen";
 $lang['admin_options'] = 'Options';
 
 $lang['admin_station_logbooks'] = 'Logbooks';
diff --git a/application/migrations/170_rename_last_login.php b/application/migrations/170_rename_last_login.php
new file mode 100644
index 000000000..ed02e6486
--- /dev/null
+++ b/application/migrations/170_rename_last_login.php
@@ -0,0 +1,34 @@
+<?php
+
+defined('BASEPATH') or exit('No direct script access allowed');
+
+// Adding a column to users table for the timestamp of the last login
+
+class Migration_rename_last_login extends CI_Migration
+{
+
+  public function up()
+  {
+    // if COL_AWARD_SUMMITED column exists, change it to COL_AWARD_SUBMITTED
+    $fields = $this->db->field_data('users');
+    foreach ($fields as $field) {
+      if ($field->name == 'last_login_date') {
+        $this->db->query(
+          'ALTER TABLE ' .
+            $this->db->escape_identifiers('users') .
+            ' CHANGE last_login_date last_seen TIMESTAMP'
+        );
+      }
+    }
+  }
+
+  public function down()
+  {
+    $this->db->query(
+      'ALTER TABLE ' .
+        $this->db->escape_identifiers('users') .
+        ' CHANGE last_seen last_login_date TIMESTAMP'
+    );
+  }
+}
+
diff --git a/application/models/User_model.php b/application/models/User_model.php
index aee836435..ca4b5372e 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -424,9 +424,9 @@ class User_Model extends CI_Model {
 	}
 
 	// FUNCTION: set's the last-login timestamp in user table
-	function set_last_login($user_id) {
+	function set_last_seen($user_id) {
 		$data = array(
-			'last_login_date' => date('Y-m-d H:i:s')
+			'last_seen' => date('Y-m-d H:i:s')
 		);
 		
 		$this->db->where('user_id', $user_id);
@@ -437,6 +437,7 @@ class User_Model extends CI_Model {
 	// Checks a user's level of access against the given $level
 	function authorize($level) {
 		$u = $this->get_by_id($this->session->userdata('user_id'));
+		$this->set_last_seen($u->row()->user_id);
 		$l = $this->config->item('auth_mode');
 		// Check to see if the minimum level of access is higher than
 		// the user's own level. If it is, use that.
diff --git a/application/views/user/main.php b/application/views/user/main.php
index 0f64bdefe..9eb67ec4b 100644
--- a/application/views/user/main.php
+++ b/application/views/user/main.php
@@ -44,7 +44,7 @@
 							<th scope="col"><?php echo lang('gen_hamradio_callsign'); ?></th>
 							<th scope="col"><?php echo lang('admin_email'); ?></th>
 							<th scope="col"><?php echo lang('admin_type'); ?></th>
-							<th scope="col"><?php echo lang('admin_last_login'); ?></th>
+							<th scope="col"><?php echo lang('admin_last_seen'); ?></th>
 							<th></th>
 							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('admin_edit'); ?></th>
 							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('admin_password_reset'); ?></th>
@@ -64,8 +64,8 @@
 							<td style="text-align: left; vertical-align: middle;"><?php $l = $this->config->item('auth_level');
 								echo $l[$row->user_type]; ?></td>
 							<td style="text-align: left; vertical-align: middle;"><?php 
-								if ($row->last_login_date != null) { // if the user never logged in before the value is null. We can show "never" then.
-									echo $row->last_login_date;
+								if ($row->last_seen != null) { // if the user never logged in before the value is null. We can show "never" then.
+									echo $row->last_seen;
 								} else {
 									echo lang('general_word_never');
 								}?>