Potential fix for username bug