Adjusted username / email fixes #12