Updated username check