Merge "Fix resetting defaults triggering prelogin"