Fixed username matching