Empty username bugfix