Added usernames and a function for expiration date