added username checks