diff --git a/castellum_core/castellum_core/castellum_auth/admin.py b/castellum_core/castellum_core/castellum_auth/admin.py
index 7dd7477ddf441c9dba268ba2a86e43e1920de31a..48500b0c1ecf95433ef76bb02ba8b5afb9617ed1 100644
--- a/castellum_core/castellum_core/castellum_auth/admin.py
+++ b/castellum_core/castellum_core/castellum_auth/admin.py
@@ -1,7 +1,23 @@
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
+from django.utils.translation import ugettext_lazy as _
 
 from .models import User
 
 
-admin.site.register(User, UserAdmin)
+@admin.register(User)
+class UserAdmin(BaseUserAdmin):
+    fieldsets = (
+        (None, {
+            'fields': ('username', 'password')
+        }),
+        (_('Personal info'), {
+            'fields': ('first_name', 'last_name', 'email')
+        }),
+        (_('Permissions'), {
+            'fields': ('is_active', 'is_staff', 'is_superuser', 'groups', 'user_permissions')
+        }),
+        (_('Important dates'), {
+            'fields': ('last_login', 'date_joined', 'expiration_date')
+        }),
+    )
diff --git a/castellum_core/castellum_core/castellum_auth/migrations/0002_user_expiration_date.py b/castellum_core/castellum_core/castellum_auth/migrations/0002_user_expiration_date.py
new file mode 100644
index 0000000000000000000000000000000000000000..63dfdb35b338c3139cdb6d13f320bf595d01c8ec
--- /dev/null
+++ b/castellum_core/castellum_core/castellum_auth/migrations/0002_user_expiration_date.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.4 on 2018-05-02 12:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('castellum_auth', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='expiration_date',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Expiration date'),
+        ),
+    ]
diff --git a/castellum_core/castellum_core/castellum_auth/models.py b/castellum_core/castellum_core/castellum_auth/models.py
index 3d305253bf8157dcb4249315ffef41fa60655ab5..9ec483e5559218c79158dc305f68278d7a4a5a49 100644
--- a/castellum_core/castellum_core/castellum_auth/models.py
+++ b/castellum_core/castellum_core/castellum_auth/models.py
@@ -1,5 +1,7 @@
+from django.db import models
 from django.contrib.auth.models import AbstractUser
+from django.utils.translation import ugettext_lazy as _
 
 
 class User(AbstractUser):
-    pass
+    expiration_date = models.DateTimeField(_('Expiration date'), blank=True, null=True)