Add username check