corrected commenting and changed over to use user_name field instead of firstname