added username check