Updated with the username fix