diff --git a/application/controllers/User.php b/application/controllers/User.php
index ac447cf9..84e22fe6 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -805,6 +805,7 @@ class User extends CI_Controller {
 		}
 	}
 
+	// Send an E-Mail to the user. Function is similar to forgot_password()
 	function admin_send_passwort_reset() {
 
 		$this->load->model('user_model');
diff --git a/application/migrations/167_add_last_login.php b/application/migrations/167_add_last_login.php
index d14d21e7..802b6331 100644
--- a/application/migrations/167_add_last_login.php
+++ b/application/migrations/167_add_last_login.php
@@ -2,6 +2,8 @@
 
 defined('BASEPATH') or exit('No direct script access allowed');
 
+// Adding a column to users table for the timestamp of the last login
+
 class Migration_add_last_login extends CI_Migration
 {
 
diff --git a/application/views/user/main.php b/application/views/user/main.php
index b90840b1..b06344a0 100644
--- a/application/views/user/main.php
+++ b/application/views/user/main.php
@@ -47,7 +47,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">Last login</th>
+							<th scope="col"><?php echo lang('admin_last_login'); ?></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>
 							<th style="text-align: center; vertical-align: middle;" scope="col"><?php echo lang('admin_delete'); ?></th>
@@ -66,7 +66,7 @@
 							<td><?php $l = $this->config->item('auth_level');
 								echo $l[$row->user_type]; ?></td>
 							<td><?php 
-								if ($row->last_login_date != null) {
+								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;
 								} else {
 									echo lang('general_word_never');