diff --git a/website/web/__init__.py b/website/web/__init__.py
index 87c507b5..cc82c403 100644
--- a/website/web/__init__.py
+++ b/website/web/__init__.py
@@ -832,7 +832,9 @@ def capture_web():
         if 'cookies' in request.files and request.files['cookies'].filename:
             capture_query['cookies'] = request.files['cookies'].stream.read()
 
-        if request.form.get('personal_ua') and request.headers.get('User-Agent'):
+        if request.form.get('freetext_ua'):
+            capture_query['user_agent'] = request.form['freetext_ua']
+        elif request.form.get('personal_ua') and request.headers.get('User-Agent'):
             capture_query['user_agent'] = request.headers['User-Agent']
         else:
             capture_query['user_agent'] = request.form['user_agent']
diff --git a/website/web/templates/capture.html b/website/web/templates/capture.html
index 71585abf..48e0a112 100644
--- a/website/web/templates/capture.html
+++ b/website/web/templates/capture.html
@@ -48,20 +48,84 @@
       </div>
     </div>
 
+    <p style="font-size: x-large"><b>Browser Configuration</b> (Lookyloo uses an emulated browser for all captures)</p>
+    <div class="card card-body">
+      {% if personal_ua %}
+      <div class="form-group row">
+        <div class="col-sm-10">
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" name="personal_ua"></input>
+            <label for="personal_ua" class="form-check-label">Use the current <a href="https://en.wikipedia.org/wiki/User_agent">user-agent</a> of your own browser:</br>
+                {{ personal_ua }}
+            </label>
+          </div>
+        </div>
+      </div>
+      <div class="dropdown-divider"></div>
+      <div><b>Or</b> pick the user agent of your choice:</div>
+      </br>
+      {% endif %}
+
+      <div class="form-group row">
+        <label for="os" class="col-sm-2 col-form-label">Operating System:</label>
+        <div class="col-sm-10">
+          <select class="form-control" name="os" id="os">
+            {% for os in user_agents.keys() %}
+            <!-- Select the default os -->
+            <option value="{{ os }}" {% if os==default['os'] %}selected{% endif %}>{{ os }}</option>
+            {% endfor%}
+          </select>
+        </div>
+      </div>
+
+    {% for os, browsers in user_agents.items() %}
+      <!-- Hide the browsers that aren't part of the default os -->
+      <div id="{{os.replace(' ', '_')}}" class="style-sub-1 form-group row" {% if not os==default['os'] %}style="display: none;"{%endif%}>
+        <label for="browser" class="col-sm-2 col-form-label">Browser Type:</label>
+        <div class="col-sm-10">
+          <!-- Disable all the selects not related to the default os -->
+          <select class="form-control" name="browser" {% if not os==default['os'] %}disabled{%endif%}>
+          {% for browser in browsers.keys()%}
+          <!-- Select the default browser -->
+          <option value="{{ browser }}" {% if browser==default['browser'] %}selected{% endif %}>{{ browser }}</option>
+          {% endfor%}
+          </select>
+        </div>
+      </div>
+      {% for browser, user_agents in browsers.items()%}
+      <!-- Hide the user agents that aren't part of the default OS and browsers that aren't part of the default os -->
+      <div id="{{os.replace(' ', '_')}}_{{browser.replace(' ', '_')}}" class="style-sub-2 form-group row" {% if not os==default['os'] or not browser==default['browser']%} style="display: none;"{%endif%}>
+        <label for="user_agent" class="col-sm-2 col-form-label">User-Agent:</label>
+        <div class="col-sm-10">
+          <!-- Disable all the selects, unless it is in default os and browser -->
+          <select class="form-control" name="user_agent" {% if not os==default['os'] or not browser==default['browser']  %}disabled{%endif%}>
+            {% for user_agent in user_agents %}
+            <!-- Select the default ua -->
+            <option value="{{ user_agent }}" {% if user_agent==default['useragent'] %}selected{% endif %}>{{ user_agent }}</option>
+            {% endfor%}
+          </select>
+        </div>
+      </div>
+      {% endfor%}
+    {% endfor%}
+      <div class="dropdown-divider"></div>
+      <div><b>Or</b> type the user-agent of your choice:</div>
+      </br>
+      <div class="form-group row">
+        <label for="freetext_ua" class="col-sm-2 col-form-label">User-Agent:</label>
+        <div class="col-sm-10">
+            <input type="text" class="form-control" name="freetext_ua" id="freetext_ua"
+                   placeholder="String to use as a User-Agent for the capture">
+        </div>
+      </div>
+    </div>
     <div>
       <button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapseConfigCapture" aria-expanded="false" aria-controls="collapseConfigCapture">
           <p style="margin-left: -12px; margin-top: 12px; font-size: x-large; color: black; text-decoration: underline; text-decoration-color: blue;"><b>Capture Configuration</b></p>
-        <!--
-        <span class="if-collapsed">
-          <img src="{{ url_for('static', filename='up.jpg') }}" class="arrow-down" alt="Expand config" height="25" width="25" title="Expand">
-        </span>
-        <span class="if-not-collapsed">
-          <img src="{{ url_for('static', filename='up.jpg') }}" alt="Minimize config" height="25" width="25" title="Collapse">
-        </span>
-        -->
       </button>
       <div class="help-tip" title="Edit configuration options for the capture."></div>
     </div>
+
     <div id="collapseConfigCapture" class="collapse">
       <div class="card card-body">
         {% if max_depth >= 2 %}
@@ -109,66 +173,6 @@
 
     <div class="dropdown-divider"></div>
 
-    <p style="font-size: x-large"><b>Browser Configuration</b> (Lookyloo uses an emulated browser for all captures)</p>
-    <div class="card card-body">
-      {% if personal_ua %}
-      <div class="form-group row">
-        <div class="col-sm-10">
-          <div class="form-check">
-            <input class="form-check-input" type="checkbox" name="personal_ua"></input>
-            <label for="personal_ua" class="form-check-label">Use the current <a href="https://en.wikipedia.org/wiki/User_agent">user-agent</a> of your own browser:</br>
-                {{ personal_ua }}
-            </label>
-          </div>
-        </div>
-      </div>
-      <div>Or pick the user agent of your choice:</div>
-      </br>
-      {% endif %}
-
-      <div class="form-group row">
-        <label for="os" class="col-sm-2 col-form-label">Operating System:</label>
-        <div class="col-sm-10">
-          <select class="form-control" name="os" id="os">
-            {% for os in user_agents.keys() %}
-            <!-- Select the default os -->
-            <option value="{{ os }}" {% if os==default['os'] %}selected{% endif %}>{{ os }}</option>
-            {% endfor%}
-          </select>
-        </div>
-      </div>
-
-    {% for os, browsers in user_agents.items() %}
-      <!-- Hide the browsers that aren't part of the default os -->
-      <div id="{{os.replace(' ', '_')}}" class="style-sub-1 form-group row" {% if not os==default['os'] %}style="display: none;"{%endif%}>
-        <label for="browser" class="col-sm-2 col-form-label">Browser Type:</label>
-        <div class="col-sm-10">
-          <!-- Disable all the selects not related to the default os -->
-          <select class="form-control" name="browser" {% if not os==default['os'] %}disabled{%endif%}>
-          {% for browser in browsers.keys()%}
-          <!-- Select the default browser -->
-          <option value="{{ browser }}" {% if browser==default['browser'] %}selected{% endif %}>{{ browser }}</option>
-          {% endfor%}
-          </select>
-        </div>
-      </div>
-      {% for browser, user_agents in browsers.items()%}
-      <!-- Hide the user agents that aren't part of the default OS and browsers that aren't part of the default os -->
-      <div id="{{os.replace(' ', '_')}}_{{browser.replace(' ', '_')}}" class="style-sub-2 form-group row" {% if not os==default['os'] or not browser==default['browser']%} style="display: none;"{%endif%}>
-        <label for="user_agent" class="col-sm-2 col-form-label">User Agent:</label>
-        <div class="col-sm-10">
-          <!-- Disable all the selects, unless it is in default os and browser -->
-          <select class="form-control" name="user_agent" {% if not os==default['os'] or not browser==default['browser']  %}disabled{%endif%}>
-            {% for user_agent in user_agents %}
-            <!-- Select the default ua -->
-            <option value="{{ user_agent }}" {% if user_agent==default['useragent'] %}selected{% endif %}>{{ user_agent }}</option>
-            {% endfor%}
-          </select>
-        </div>
-      </div>
-      {% endfor%}
-    {% endfor%}
-    </div>
     <center>
       <b>
       {% if default_public %}