diff --git a/webtools/uninstall_survey/controllers/results_controller.php b/webtools/uninstall_survey/controllers/results_controller.php
index db5b1a22c29a..2ac51ff93a5a 100644
--- a/webtools/uninstall_survey/controllers/results_controller.php
+++ b/webtools/uninstall_survey/controllers/results_controller.php
@@ -72,12 +72,51 @@ class ResultsController extends AppController {
         $_application = $this->Application->findAll($_conditions);
 
         if (empty($_application)) {
-            // The application they entered in the URL is not in the db.  This could
-            // mean it's not added yet, or, it could mean they typed in something
-            // manually.  Either way, not a whole lot we can do at this point...I
-            // guess we'll redirect them
-                $this->flash('', '/results');
-                exit;
+            // The application they entered in the URL is not in the db.  We'll have
+            // to put it in the db, but we don't want it to show up (in case they
+            // just typed something in manually) so we'll flag it as not visible.
+            $app = new Application();
+            $app->set('name', $_input_name);
+            $app->set('version', $_input_ua);
+            $app->set('visible', 0);
+            $app->save();
+
+            $app_id = $app->getLastInsertID();
+
+            // Warning: hard coding ahead! - Hopefully this is a temporary thing.
+            // The database will handle any combination of questions
+            // (issues/intentions) and applications+versions.  However, since we're
+            // adding stuff in that comes in over the URL, we kinda have to guess at
+            // what questions should be associated.  So, I'm running a stristr() on
+            // the $_GET values to get a general set of questions to associate, and 
+            // then manually adding those values to the table.
+            if (stristr($this->params['url']['application'], 'Firefox') !== false) {
+                // Intention Id's
+                $this->Intention->query("INSERT INTO applications_intentions VALUES ({$app_id}, 1), ({$app_id}, 2), ({$app_id}, 3), ({$app_id}, 9)");
+
+                // Issue Id's
+                $this->Issue->query("INSERT INTO applications_issues VALUES ({$app_id}, 1), ({$app_id}, 2), ({$app_id}, 3), ({$app_id}, 4), ({$app_id}, 5), ({$app_id}, 6), ({$app_id}, 7), ({$app_id}, 8), ({$app_id}, 9), ({$app_id}, 15)");
+
+            } elseif (stristr($this->params['url']['application'], 'Thunderbird') !== false) {
+
+                // Intention Id's
+                $this->Intention->query("INSERT INTO applications_intentions VALUES ({$app_id}, 5), ({$app_id}, 6), ({$app_id}, 7), ({$app_id}, 8), ({$app_id}, 9)");
+
+                // Issue Id's
+                $this->Issue->query("INSERT INTO applications_issues VALUES ({$app_id}, 10), ({$app_id}, 11), ({$app_id}, 12), ({$app_id}, 13), ({$app_id}, 14), ({$app_id}, 15)"); 
+
+            } else {
+                // Whatever they entered doesn't have firefox or thunderbird in it.
+                // All they're going to see is a comment box on the other end.
+            }
+            
+
+            // We could just get the last inserted id, but we need all the info
+            // below.  Also, cake caches the query, and won't return
+            // anything if we don't alter it (add 1=1 to the end), since we already
+            // did the same query earlier
+            $_conditions = "name LIKE '{$_input_name}' AND version LIKE '{$_input_ua}' AND 1=1";
+            $_application = $this->Application->findAll($_conditions);
         }
 
         // Pull the information for our radio buttons (only the
@@ -116,7 +155,7 @@ class ResultsController extends AppController {
     function index() 
     {
         // Products dropdown
-        $this->set('products', $this->Application->findAll());
+        $this->set('products', $this->Application->findAll('visible=1'));
 
         // Fill in all the data passed in $_GET
         $this->set('url_params',$this->decodeAndSanitize($this->params['url']));
@@ -137,7 +176,7 @@ class ResultsController extends AppController {
     function comments()
     {
         // Products dropdown
-        $this->set('products', $this->Application->findAll());
+        $this->set('products', $this->Application->findAll('visible=1'));
 
         // Fill in all the data passed in $_GET
         $this->set('url_params',$this->decodeAndSanitize($this->params['url']));
diff --git a/webtools/uninstall_survey/models/result.php b/webtools/uninstall_survey/models/result.php
index 1236b5967948..8fd7d01dafa1 100644
--- a/webtools/uninstall_survey/models/result.php
+++ b/webtools/uninstall_survey/models/result.php
@@ -363,7 +363,7 @@ class Result extends AppModel {
         $_http_user_agent = mysql_real_escape_string($_SERVER['HTTP_USER_AGENT']);
 
         // Make sure our required variables are set and correct
-        if (!is_numeric($_application_id) || !is_numeric($_intention_id)) {
+        if (!is_numeric($_application_id)) {
             return false;
         }
 
diff --git a/webtools/uninstall_survey/views/results/add.thtml b/webtools/uninstall_survey/views/results/add.thtml
index 85129ea0697c..bd0711d49472 100644
--- a/webtools/uninstall_survey/views/results/add.thtml
+++ b/webtools/uninstall_survey/views/results/add.thtml
@@ -1,28 +1,32 @@
 <?php echo $html->formTag('/results/add'); ?>
 
-<h2>How did you intend to use <?php echo $intentions['Application']['name']; ?> when you installed it?</h2>
-<?php foreach ($intentions['Intention'] as $var => $val) : ?>
-    <input type="radio" name="data[Result][intention_id]" id="radio<?php echo $val['id']; ?>" value="<?php echo $val['id']; ?>"><label for="radio<?php echo $val['id']; ?>"><?php echo $val['description']; ?></label>
-    <?php
-        if ($val['description'] == 'Other') {
-            echo $html->input('Result/intention_text');
-        }
+<?php if(!empty($intentions['Intention'])): ?>
+    <h2>How did you intend to use <?php echo $intentions['Application']['name']; ?> when you installed it?</h2>
+    <?php foreach ($intentions['Intention'] as $var => $val) : ?>
+        <input type="radio" name="data[Result][intention_id]" id="radio<?php echo $val['id']; ?>" value="<?php echo $val['id']; ?>"><label for="radio<?php echo $val['id']; ?>"><?php echo $val['description']; ?></label>
+        <?php
+            if ($val['description'] == 'Other') {
+                echo $html->input('Result/intention_text');
+            }
 
-    ?>
-    <br />
-<?php endforeach; ?>
+        ?>
+        <br />
+    <?php endforeach; ?>
+<?php endif; ?>
 
 
-<h2>Why did you uninstall <?php echo $intentions['Application']['name']; ?>? (select all that apply)</h2>
-<?php foreach ($issues['Issue'] as $var => $val) : ?>
-    <input type="checkbox" name="data[Issue][id][]" id="checkbox<?php echo $val['id']; ?>" value="<?php echo $val['id']; ?>"><label for="checkbox<?php echo $val['id']; ?>"><?php echo $val['description']; ?></label>
-    <?php
-        if ($val['description'] == 'Other') {
-            echo $html->input('issues_results/other');
-        }
-    ?>
-    <br />
-<?php endforeach; ?>
+<?php if(!empty($issues['Issue'])): ?>
+    <h2>Why did you uninstall <?php echo $intentions['Application']['name']; ?>? (select all that apply)</h2>
+    <?php foreach ($issues['Issue'] as $var => $val) : ?>
+        <input type="checkbox" name="data[Issue][id][]" id="checkbox<?php echo $val['id']; ?>" value="<?php echo $val['id']; ?>"><label for="checkbox<?php echo $val['id']; ?>"><?php echo $val['description']; ?></label>
+        <?php
+            if ($val['description'] == 'Other') {
+                echo $html->input('issues_results/other');
+            }
+        ?>
+        <br />
+    <?php endforeach; ?>
+<?php endif; ?>
 
 <h2>How can we improve <?php echo $intentions['Application']['name']; ?>?</h2>
 <p>Please share your ideas, suggestions or details about any issues below.</p>