Bugfix: Handle more scenario’s for —no-interaction