Improved design by moving expiration time login to password reset model