added username guard and moved functionality out of if-statement