diff --git a/airtime_mvc/build/airtime-setup/forms/finish-settings.php b/airtime_mvc/build/airtime-setup/forms/finish-settings.php
index 809013b4d..bf98c954e 100644
--- a/airtime_mvc/build/airtime-setup/forms/finish-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/finish-settings.php
@@ -17,6 +17,5 @@
 <script>
     $("#finishSettingsForm").submit(function(e) {
         submitForm(e, "FinishSetup");
-        // window.location.replace("/?config");
     });
 </script>
\ No newline at end of file
diff --git a/airtime_mvc/build/airtime-setup/forms/general-settings.php b/airtime_mvc/build/airtime-setup/forms/general-settings.php
index 14e788459..dbfbb570a 100644
--- a/airtime_mvc/build/airtime-setup/forms/general-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/general-settings.php
@@ -3,16 +3,19 @@
 
 <form action="#" role="form" id="generalSettingsForm">
     <h3 class="form-title">General Settings</h3>
+    <p>
+        These values are automatically pulled from your webserver settings, under most circumstances you will not need to change them.
+    </p>
     <span id="helpBlock" class="help-block help-message"></span>
     <div id="generalFormBody">
         <div class="form-group">
             <label class="control-label" for="generalHost">Webserver Host</label>
-            <input required class="form-control" type="text" name="generalHost" id="generalHost" placeholder="Host" value="localhost"/>
+            <input required class="form-control" type="text" name="generalHost" id="generalHost" placeholder="Host" value="<?=$_SERVER["SERVER_NAME"]?>"/>
             <span class="glyphicon glyphicon-remove form-control-feedback"></span>
         </div>
         <div class="form-group">
             <label class="control-label" for="generalPort">Webserver Port</label>
-            <input required class="form-control" type="text" name="generalPort" id="generalPort" placeholder="Port" value="80"/>
+            <input required class="form-control" type="text" name="generalPort" id="generalPort" placeholder="Port" value="<?=$_SERVER["SERVER_PORT"]?>"/>
             <span class="glyphicon glyphicon-remove form-control-feedback"></span>
         </div>
         <input class="form-control" type="hidden" name="generalErr" id="generalErr" aria-describedby="helpBlock"/>