diff --git a/app/controllers/SetupController.php b/app/controllers/SetupController.php
index c97ce394..946557a2 100644
--- a/app/controllers/SetupController.php
+++ b/app/controllers/SetupController.php
@@ -35,6 +35,7 @@ class SetupController extends Controller {
             // Pull the user details out.
             $userDetails = array_pull($postData, 'user');
 
+            // TODO: Do we want to just use Eloquent::unguard() here?
             $user = User::create([
                 'username' => $userDetails['username'],
                 'email' => $userDetails['email'],
diff --git a/app/models/User.php b/app/models/User.php
index e3054410..4d998eb0 100644
--- a/app/models/User.php
+++ b/app/models/User.php
@@ -25,7 +25,14 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
      * Items which can be mass assigned.
      * @var array
      */
-    protected $fillable = ['username'];
+    protected $fillable = [
+        'username',
+        'password',
+        'email',
+        'remember_token',
+        'active',
+        'level',
+    ];
 
     /**
      * Hash any password being inserted by default