fixed missing user_name logic