added username guard