diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index ed45eb44d..7406b2d21 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -37,6 +37,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 		$allUsers = $this->params['allusers'];
 		$httproot = $this->params['httproot'];
 		$quota = $this->params['quota'];
+		$pwdexpiration = $this->params['pwdexpiration'];
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -44,10 +45,12 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation("", "admin_tools");
 		$this->contentHeading(getMLText("user_list"));
 		$this->contentContainerStart();
+
+		$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
 ?>
 
 	<table class="table table-condensed">
-	  <tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th></th><th></th></tr>
+	  <tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('discspace'); ?></th><th><?php printMLText('authentication'); ?></th><th></th></tr>
 <?php
 		foreach ($allUsers as $currUser) {
 			echo "<tr>";
@@ -94,6 +97,25 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</td>";
 			echo "<td>";
+			if($pwdexpiration) {
+				$now = new DateTime();
+				$expdate = new DateTime($currUser->getPwdExpiration());
+				$diff = $now->diff($expdate);
+				if($expdate > $now) {
+					printf(getMLText('password_expires_in_days'), $diff->format('%a'));
+					echo " (".$expdate->format('Y-m-d H:i:sP').")";
+				} else {
+					printMLText("password_expired");
+				}
+			}
+			$sessions = $sessionmgr->getUserSessions($currUser);
+			if($sessions) {
+				foreach($sessions as $session) {
+					echo "<br />".getMLText('lastaccess').": ".getLongReadableDate($session->getLastAccess());
+				}
+			}
+			echo "</td>";
+			echo "<td>";
 			echo "<div class=\"list-action\">";
      	echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
      	echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>";