diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 1ece188c..63942ed2 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -125,9 +125,9 @@ def menu_diags(*args):
             if diag_modes[int(selection)-1]['Name'] != 'Quick drive test':
                 # Save log for non-quick tests
                 ticket_number = get_ticket_number()
-                global_vars['LogDir'] = '{}/Tickets/{}'.format(
+                global_vars['LogDir'] = '{}/Logs/{}'.format(
                     global_vars['Env']['HOME'],
-                    ticket_number)
+                    ticket_number if ticket_number else global_vars['Date-Time'])
                 os.makedirs(global_vars['LogDir'], exist_ok=True)
                 global_vars['LogFile'] = '{}/Hardware Diagnostics.log'.format(
                     global_vars['LogDir'])