diff --git a/app/Controllers/Scripts.php b/app/Controllers/Scripts.php
index 4a74c15fe..c05933ec1 100644
--- a/app/Controllers/Scripts.php
+++ b/app/Controllers/Scripts.php
@@ -32,13 +32,15 @@ class Scripts extends BaseController
 {
     public function download($id)
     {
-        $id = intval($id);
         if (empty($this->scriptsModel)) {
             $this->scriptsModel = model('App\Models\ScriptsModel');
         }
         if (!is_numeric($id)) {
             $id = $this->scriptsModel->getByOs($id);
         }
+        if (is_numeric($id)) {
+            $id = intval($id);
+        }
         if (empty($id)) {
             return;
         }
diff --git a/app/Models/ScriptsModel.php b/app/Models/ScriptsModel.php
index da24073b1..1ebb60296 100644
--- a/app/Models/ScriptsModel.php
+++ b/app/Models/ScriptsModel.php
@@ -358,7 +358,12 @@ public function download(int $id = 0): ?string
             if (!empty($instance->config->default_network_address)) {
                 $options->url = $instance->config->default_network_address . 'index.php/input/devices';
             } else {
-                unset($options->url);
+                $baseURL = base_url();
+                if (!empty($baseURL)) {
+                    $options->url = $baseURL . 'index.php/input/devices';
+                } else {
+                    unset($options->url);
+                }
             }
         }
         $find = 'Configuration from web UI here';
diff --git a/app/Views/logon.php b/app/Views/logon.php
index 88dcf72f8..a339f3f22 100644
--- a/app/Views/logon.php
+++ b/app/Views/logon.php
@@ -133,7 +133,6 @@
                                         <div class="offset-2 col-8" style="position:relative;">
                                         <br><span class="text-secondary">Don't forget about the Open-AudIT wiki for all your documentation.<br><a target='_blank' href='https://community.opmantek.com/display/OA/Home'>https://community.opmantek.com/display/OA/Home</a></span>
                                         </div>
-                                        <?php if (!empty($config->default_network_address) and strpos($config->default_network_address, '127.0.0.1') === false and strpos($config->default_network_address, 'localhost') === false and !empty($config->default_network_address)) { ?>
                                         <span align='center'>
                                             <br>
                                             <button id="audit" name="audit" type="button" class="btn btn-primary" data-bs-toggle="collapse" data-bs-target="#audit_select"><?= __('Audit My PC') ?></button>
@@ -157,11 +156,13 @@
                                                     </form>
                                                 </div>
                                                 <br />
-                                                <?= __('The direct link for the script is') ?><br /><a href="#" id="go_link">#</a><br />
+                                                <?= __('The direct link for the script is') ?>&nbsp;<a href="#" id="go_link">#</a><br />
                                                 <?= __('You may want to copy and paste this URL in an email to your staff.') ?>
+                                                <?php if (stripos(base_url(), 'localhost') !== false or stripos(base_url(), '127.0.0') !== false) {
+                                                    echo __('<br><br><strong>NOTE</strong> - You are accessing this URL from the local Open-AudIT server. The downloaded script will not be able to submit when run on any other machine.<br />If you need to audit other machines, please download the script from a remote machine, not the Open-AudIT server itself.');
+                                                } ?>
                                             </div>
                                         </span>
-                                        <?php } ?>
                                         <br>&nbsp;
                                     </div>
                                 </div>