Fix for username causing login to fail