fixup! fixup! fixup! fixup! fixup! Work with automatic login and sonar run