Add user admin improvments and checkin listener