fixed issue in username handling