Fixed username support