diff --git a/.gitignore b/.gitignore
index 0d20b64..4395004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 *.pyc
+*.tar.gz
+*.whl
diff --git a/keystone_keycloak_backend/identity.py b/keystone_keycloak_backend/identity.py
index 921e1ca..b23e714 100644
--- a/keystone_keycloak_backend/identity.py
+++ b/keystone_keycloak_backend/identity.py
@@ -68,7 +68,9 @@ def _format_user(self, user):
             "id": user["id"],
             "name": user["username"],
             # "password":
-            # "password_expires_at":
+            # TODO(mnaser): We should probably find a way to scrape into the
+            #               credentials API and return the expiry date.
+            "password_expires_at": None,
             "enabled": user["enabled"],
             # "default_project_id":
             # NOTE(mnaser): This is required or we'll fail with a KeyError