diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala
index 66ec170..099086f 100644
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -38,7 +38,7 @@
 
   post("/:userName/_edit", form)(ownerOnly { form =>
     val userName = params("userName")
-    val currentDate = new java.sql.Date(System.currentTimeMillis)
+    val currentDate = new java.sql.Timestamp(System.currentTimeMillis)
     updateAccount(getAccountByUserName(userName).get.copy(
       mailAddress    = form.mailAddress,
       url            = form.url,
diff --git a/src/main/scala/app/UsersController.scala b/src/main/scala/app/UsersController.scala
index 0e4f732..7b4bd7d 100644
--- a/src/main/scala/app/UsersController.scala
+++ b/src/main/scala/app/UsersController.scala
@@ -36,7 +36,7 @@
   })
   
   post("/admin/users/_new", newForm)(adminOnly { form =>
-    val currentDate = new java.sql.Date(System.currentTimeMillis)
+    val currentDate = new java.sql.Timestamp(System.currentTimeMillis)
     createAccount(Account(
         userName       = form.userName, 
         password       = form.password, 
@@ -57,7 +57,7 @@
   
   post("/admin/users/:name/_edit", editForm)(adminOnly { form =>
     val userName = params("userName")
-    val currentDate = new java.sql.Date(System.currentTimeMillis)
+    val currentDate = new java.sql.Timestamp(System.currentTimeMillis)
     updateAccount(getAccountByUserName(userName).get.copy(
         password     = form.password,
         mailAddress  = form.mailAddress,
diff --git a/src/main/scala/model/Account.scala b/src/main/scala/model/Account.scala
index 5a88b52..b92e89c 100644
--- a/src/main/scala/model/Account.scala
+++ b/src/main/scala/model/Account.scala
@@ -8,11 +8,10 @@
   def password = column[String]("PASSWORD")
   def isAdmin = column[Boolean]("ADMINISTRATOR")
   def url = column[String]("URL")
-  def registeredDate = column[java.sql.Date]("REGISTERED_DATE")	// TODO convert java.util.Date later
-  def updatedDate = column[java.sql.Date]("UPDATED_DATE")
-  def lastLoginDate = column[java.sql.Date]("LAST_LOGIN_DATE")
+  def registeredDate = column[java.sql.Timestamp]("REGISTERED_DATE")	// TODO convert java.util.Date later
+  def updatedDate = column[java.sql.Timestamp]("UPDATED_DATE")
+  def lastLoginDate = column[java.sql.Timestamp]("LAST_LOGIN_DATE")
   def * = userName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? <> (Account, Account.unapply _)
-//  def ins = userName ~ mailAddress ~ password ~ userType ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? <> ({ t => Account(None, t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8)}, { (o: Account) => Some((o.userName, o.mailAddress, o.password, o.userType, o.url, o.registeredDate, o.updatedDate, o.lastLoginDate))})
 }
 
 case class Account(
@@ -21,9 +20,9 @@
     password: String,
     isAdmin: Boolean,
     url: Option[String],
-    registeredDate: java.sql.Date,
-    updatedDate: java.sql.Date,
-    lastLoginDate: Option[java.sql.Date]
+    registeredDate: java.sql.Timestamp,
+    updatedDate: java.sql.Timestamp,
+    lastLoginDate: Option[java.sql.Timestamp]
 )
 
 class AccountDao {
diff --git a/src/main/scala/service/AccountService.scala b/src/main/scala/service/AccountService.scala
index 4834e44..e55cf6f 100644
--- a/src/main/scala/service/AccountService.scala
+++ b/src/main/scala/service/AccountService.scala
@@ -28,6 +28,6 @@
   
   def updateLastLoginDate(userName: String): Unit =
     Query(Accounts).filter(_.userName is userName.bind).map(_.lastLoginDate)
-      .update(new java.sql.Date(System.currentTimeMillis))
+      .update(new java.sql.Timestamp(System.currentTimeMillis))
   
 }
diff --git a/src/main/twirl/admin/userlist.scala.html b/src/main/twirl/admin/userlist.scala.html
index c9d3cc6..e72dd73 100644
--- a/src/main/twirl/admin/userlist.scala.html
+++ b/src/main/twirl/admin/userlist.scala.html
@@ -1,5 +1,6 @@
 @(users: List[model.Account])(implicit context: app.Context)
 @import context._
+@import view.helpers
 @html.main("Manage Users"){
   <div style="text-align: right; margin-bottom: 4px;">
     <a href="@path/admin/users/_new" class="btn">New User</a>
@@ -26,9 +27,9 @@
           }
         </td>
         <td>@account.url</td>
-        <td>@account.registeredDate</td>
-        <td>@account.updatedDate</td>
-        <td>@account.lastLoginDate</td>
+        <td>@helpers.datetime(account.registeredDate)</td>
+        <td>@helpers.datetime(account.updatedDate)</td>
+        <td>@account.lastLoginDate.map(helpers.datetime)</td>
       </tr>
     }
   </table>