diff --git a/server/mhn/api/views.py b/server/mhn/api/views.py
index 81a60e7e..0c8cb5b5 100644
--- a/server/mhn/api/views.py
+++ b/server/mhn/api/views.py
@@ -35,7 +35,11 @@ def create_sensor():
     else:
         sensor = Sensor(**request.json)
         sensor.uuid = str(uuid1())
-        sensor.ip = request.remote_addr
+        try:
+            if request.json['ip'] == "":
+                sensor.ip = request.remote_addr
+        except KeyError:
+            sensor.ip = request.remote_addr
         Clio().authkey.new(**sensor.new_auth_dict()).post()
         try:
             db.session.add(sensor)
diff --git a/server/mhn/static/js/main.js b/server/mhn/static/js/main.js
index b2bc2fbd..79f7b312 100644
--- a/server/mhn/static/js/main.js
+++ b/server/mhn/static/js/main.js
@@ -21,7 +21,8 @@ $(document).ready(function() {
             var sensorObj = {
                 name: $('#name').val(),
                 hostname: $('#hostname').val(),
-                honeypot: $('#honeypot').val()
+                honeypot: $('#honeypot').val(),
+                ip: $('#ip').val()
             };
 
             $('#alert-row').hide();
@@ -385,7 +386,7 @@ $(document).ready(function() {
                         $('#error-txt').html(resp.responseJSON.error);
                         $('#msg-container').show();
                     }
-                });    
+                });
             } else {
                 $('#alert-text').removeClass('success').addClass('warning');
                 $('#error-txt').html('Not a valid email address');
diff --git a/server/mhn/templates/ui/add-sensor.html b/server/mhn/templates/ui/add-sensor.html
index 58e71027..7c29de9f 100644
--- a/server/mhn/templates/ui/add-sensor.html
+++ b/server/mhn/templates/ui/add-sensor.html
@@ -14,9 +14,12 @@ <h2>Add a Sensor</h2>
             <div class="small-3 columns">
                 <label>Hostname</label>
             </div>
-            <div class="small-3 pull-3 columns">
+            <div class="small-3 columns">
                 <label>Honeypot</label>
             </div>
+	    <div class="small-3 columns">
+                <label>IP (optional)</label>
+            </div>
         </div>
         <div class="row">
             <input id="_csrf_token" name="_csrf_token" type="hidden" value="{{ csrf_token() }}">
@@ -29,7 +32,10 @@ <h2>Add a Sensor</h2>
             <div class="small-3 columns">
                 <input id="honeypot" type="text" name="honeypot" />
             </div>
-            <div class="small-6 columns">
+	    <div class="small-3 columns">
+                <input id="ip" type="text" name="ip" />
+            </div>
+            <div class="small-3 columns">
                 <input id="create-btn" class="tiny button" type="submit" value="CREATE" />
             </div>
         </div>