diff --git a/cisco_ap_ctl.py b/cisco_ap_ctl.py
index 496f15a6..3b83e98d 100755
--- a/cisco_ap_ctl.py
+++ b/cisco_ap_ctl.py
@@ -186,6 +186,20 @@ def main():
             logg.info("Expect: {} i: {} before: {} after: {}".format(AP_PROMPT,i,egg.before,egg.after))
             egg.sendline(AP_EN) 
             sleep(1)
+            j = egg.expect_exact([AP_PASSWORD,pexpect.TIMEOUT],timeout=5)
+            if j == 0:
+                logg.info("Expect: {} i: {} j: {} before: {} after: {}".format(AP_PASSWORD,i,j,egg.before,egg.after))
+                egg.sendline(args.passwd) 
+                sleep(1)
+                k = egg.expect_exact([AP_HASH,pexpect.TIMEOUT],timeout=5)
+                if k == 0:
+                    logg.info("Expect: {} i: {} j: {} k: {} before: {} after: {}".format(AP_PASSWORD,i,j,k,egg.before,egg.after))
+                    logged_in = True
+                if k == 1:
+                    logg.info("Expect: {} i: {} j: {} k: {} before: {} after: {}".format("Timeout",i,j,k,egg.before,egg.after))
+            if j == 1:
+                logg.info("Expect: {} i: {} j: {} before: {} after: {}".format("Timeout",i,j,egg.before,egg.after))
+
         if i == 2:
             logg.info("Expect: {} i: {} before: {} after: {}".format(AP_HASH,i,egg.before,egg.after))
             logged_in = True 
diff --git a/py-scripts/lf_cisco_dfs.py b/py-scripts/lf_cisco_dfs.py
index c1b8fa1f..897e3dec 100755
--- a/py-scripts/lf_cisco_dfs.py
+++ b/py-scripts/lf_cisco_dfs.py
@@ -2379,7 +2379,7 @@ Sample script
                                                                         logg.info("DFS 5ghz channel {} being set wait CAC time 60, 2.4 ghz: {} : ".format(__chan_5ghz_set, __chan_24ghz_set))
                                                                         # read AP to verify CAC timer set
                                                                         # will need to use time to verify CAC from AP - need in results
-                                                                        cac_sleeptime = "5" # 65
+                                                                        cac_sleeptime = "65" # 65
                                                                         logg.info("CAC start sleeptime: {}".format(cac_sleeptime))
                                                                         time.sleep(int(cac_sleeptime))
                                                                         logg.info("CAC done  sleeptime: {}".format(cac_sleeptime))
@@ -2425,8 +2425,7 @@ Sample script
                                                                                     __dfs_channel = m.group(1)
                                                                                     logg.info("__dfs_channel: {}".format(__dfs_channel))
                                                                                     logg.info("__dfs_channel line: {}".format(line))
-                                                                                else:
-                                                                                    logg.info("__dfs_channel COULD NOT FIND LINE")
+                                                                                    break
                                                                     else:
                                                                         logg.info("Non-DFS 5ghz channel {} being set sleep 30, 2.4 ghz: {} ".format(__chan_5ghz_set, __chan_24ghz_set))
                                                                         time.sleep(30)