diff --git a/cc_module_9800_3504.py b/cc_module_9800_3504.py
index 6d327c89..027e57f7 100755
--- a/cc_module_9800_3504.py
+++ b/cc_module_9800_3504.py
@@ -145,8 +145,8 @@ class create_controller_series_object:
             self.port = port
 
         if timeout is None:
-            logger.info("timeout not set default to 10 sec")
-            self.timeout = '10'
+            logger.info("timeout not set default to 3 sec")
+            self.timeout = '3'
         else:
             self.timeout = timeout
 
@@ -222,11 +222,13 @@ class create_controller_series_object:
             self.command = ["./wifi_ctl_9800_3504.py", "--scheme", self.scheme, "--dest", self.dest,
                             "--user", self.user, "--passwd", self.passwd, "--prompt", self.prompt,
                             "--series", self.series, "--ap", self.ap, "--ap_band_slot", self.ap_band_slot, "--band", self.band, "--port", self.port,
+                            "--timeout", self.timeout,
                             ]
         else:
             self.command = [str(str(self.pwd) + "/wifi_ctl_9800_3504.py"), "--scheme", self.scheme, "--dest", self.dest,
                             "--user", self.user, "--passwd", self.passwd, "--prompt", self.prompt,
                             "--series", self.series, "--ap", self.ap, "--ap_band_slot", self.ap_band_slot, "--band", self.band, "--port", self.port,
+                            "--timeout", self.timeout,
                             ]
 
         # Generate command
diff --git a/wifi_ctl_9800_3504.py b/wifi_ctl_9800_3504.py
index bcfe5cd7..30535e8a 100755
--- a/wifi_ctl_9800_3504.py
+++ b/wifi_ctl_9800_3504.py
@@ -221,6 +221,9 @@ def main():
     console_handler = logging.StreamHandler()
     formatter = logging.Formatter(FORMAT)
     logg = logging.getLogger(__name__)
+    
+    logg.info("wifi_ctl command timeout set to {timeout}".format(timeout=timeout))
+
     # TODO Refactor for script to work must have output go to console_handler
     # This does work since it is a subordinate to the root logger
     # logg.setLevel(logging.DEBUG)