Reduce update hacking only when needed, saves some potential race conditionals (and password typing for non-key users).