diff --git a/insights/client/__init__.py b/insights/client/__init__.py
index <HASH>..<HASH> 100644
--- a/insights/client/__init__.py
+++ b/insights/client/__init__.py
@@ -535,9 +535,10 @@ def pre_update():
         updated = InsightsSchedule().remove_scheduling()
         if updated:
             logger.info('Automatic scheduling for Insights has been disabled.')
-        elif not os.path.exists('/etc/cron.daily/' + constants.app_name):
+        elif not os.path.exists('/etc/cron.daily/' + constants.app_name) and not config['register']:
             logger.info('Automatic scheduling for Insights already disabled.')
-        die()
+        if not config['register']:
+            die()
 
     if config['container_mode']:
         logger.debug('Not scanning host.')
@@ -600,7 +601,7 @@ def post_update():
 
     if config['register']:
         client.try_register()
-        if os.path.exists('/etc/cron.daily') and InsightsSchedule().set_daily():
+        if not config['disable_schedule'] and os.path.exists('/etc/cron.daily') and InsightsSchedule().set_daily():
             logger.info('Automatic scheduling for Insights has been enabled.')
 
     # check registration before doing any uploads
Fix disable schedule when registering (#<I>)

The `--disable-schedule` flag can now be run alongside `--register` so that the

registration will not automatically enable the cron job.