diff --git a/lib/models/config.js b/lib/models/config.js
index d1bc757a3..465b93218 100644
--- a/lib/models/config.js
+++ b/lib/models/config.js
@@ -4,7 +4,16 @@ var mongoose = require('mongoose')
 
 var Config = new Schema({
   version: Number,
-  // is there any other configuration we want?
+  serverName: String,
+  proxyUrl: String,
+
+  smtp: {
+    host: String,
+    port: Number,
+    user: String,
+    password: String,
+    fromAddress: String
+  }
 })
 
 module.exports = mongoose.model('Config', Config)
diff --git a/lib/routes/api/setup.js b/lib/routes/api/setup.js
index 33b6d668e..f3a058cec 100644
--- a/lib/routes/api/setup.js
+++ b/lib/routes/api/setup.js
@@ -1,4 +1,4 @@
-'use strict';
+'us estrict';
 
 var fs = require('fs');
 var path = require('path');
@@ -19,7 +19,7 @@ router.post('/', function (req, res) {
     }
 
     if (needsConfig) {
-      createConfig(config, function (err) {
+      createConfig(configData, function (err) {
         if (err) {
           return res.status(400).send('Invalid config data');
         }
@@ -33,6 +33,15 @@ router.post('/', function (req, res) {
         });
       });
     }
+    else {
+      createUser(userData, function (err) {
+        if (err) {
+          return res.status(400).send('Invalid user data');
+        }
+
+        res.json('ok');
+      });
+    }
   });
 });
 
@@ -42,6 +51,9 @@ function createConfig(config, cb) {
 
   // TODO: populate config, modify model first
   c.version = Config.SCHEMA_VERSION;
+  c.proxyUrl = config.general.proxyUrl;
+  c.serverName = config.general.serverName;
+  c.smtp = config.smtp;
 
   c.save(cb);
 }
diff --git a/lib/routes/index.js b/lib/routes/index.js
index 414e0b6f0..12074e37a 100644
--- a/lib/routes/index.js
+++ b/lib/routes/index.js
@@ -49,6 +49,7 @@ exports.index = function(req, res){
 
   Upgrade.isFreshDb(function (err, isFresh) {
     if (err) {
+      console.error(err);
       return res.status(500).send('Database error, make sure you\'ve setup' +
         'your mongodb instance correctly.');
     }
diff --git a/lib/views/setup.html b/lib/views/setup.html
index bbb8a4aac..902facb75 100644
--- a/lib/views/setup.html
+++ b/lib/views/setup.html
@@ -17,7 +17,11 @@ <h3>Setup Strider</h3>
             <legend>Basics</legend>
 
             <label for="basic-servername">Server Name</label>
-            <input id="basic-servername" type="text" placeholder="Publically visible url" required=true ng-model="config.general.server_name">
+            <input id="basic-servername" type="text" placeholder="Publically visible url" required=true ng-model="config.general.serverName">
+            <span class="help-block">Publicaly accessible URL for this instance of Strider, e.g. ci.mydomain.com</span>
+
+            <label for="basic-proxyurl">Proxy URL</label>
+            <input id="basic-proxyurl" type="text" placeholder="Proxy URL" ng-model="config.general.proxyUrl">
             <span class="help-block">Publicaly accessible URL for this instance of Strider, e.g. ci.mydomain.com</span>
           </fieldset>
           <button wz-next type="submit" class="btn btn-default">Next</button>
@@ -52,23 +56,23 @@ <h3>Setup Strider</h3>
             <legend>Email</legend>
 
             <label>Host</label>
-            <input type="text" placeholder="Type something…" ng-model="config.general.smtp_host">
+            <input type="text" placeholder="Type something…" ng-model="config.smtp.host">
             <span class="help-block">Example block-level help text here.</span>
 
             <label>Port</label>
-            <input type="text" placeholder="Type something…" ng-model="config.general.smtp_port">
+            <input type="text" placeholder="Type something…" ng-model="config.smtp.port">
             <span class="help-block">Example block-level help text here.</span>
 
             <label>User</label>
-            <input type="text" placeholder="Type something…" ng-model="config.general.smtp_user">
+            <input type="text" placeholder="Type something…" ng-model="config.smtp.user">
             <span class="help-block">Example block-level help text here.</span>
 
             <label>Password</label>
-            <input type="text" placeholder="Type something…" ng-model="config.general.smtp_pass">
+            <input type="text" placeholder="Type something…" ng-model="config.smtp.password">
             <span class="help-block">Example block-level help text here.</span>
 
             <label>From Email Address</label>
-            <input type="text" placeholder="Type something…" ng-model="config.general.smtp_from">
+            <input type="text" placeholder="Type something…" ng-model="config.smtp.fromAddress">
             <span class="help-block">Example block-level help text here.</span>
           </fieldset>
           <button wz-finish type="submit" class="btn btn-primary">Finish</button>