Merge "Only start authentication if setting is enabled"