Empty username bug fix