Fix user_name went missing