diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 2ddd6a067f3f..6f104dfda9e0 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -45,7 +45,7 @@ class CompanyUserTransformer extends EntityTransformer
 
     public function transform(CompanyUser $company_user)
     {
-        return [
+        return ['company_user' => [
             'permissions' => $company_user->permissions,
             'settings' => $company_user->settings,
             'is_owner' => (bool) $company_user->is_owner,
@@ -53,6 +53,7 @@ class CompanyUserTransformer extends EntityTransformer
             'is_locked' => (bool) $company_user->is_locked,
             'updated_at' => $company_user->updated_at,
             'deleted_at' => $company_user->deleted_at,
+            ]
         ];
     }
 
diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php
index a9ec682dff4e..ccae173e58a6 100644
--- a/database/migrations/2014_10_13_000000_create_users_table.php
+++ b/database/migrations/2014_10_13_000000_create_users_table.php
@@ -389,7 +389,7 @@ class CreateUsersTable extends Migration
 
             $t->unsignedInteger('recurring_invoice_id')->nullable();
 
-            $t->string('invoice_number')->default('');
+            $t->string('invoice_number')->nullable();
             $t->float('discount')->default(0);
             $t->boolean('is_amount_discount')->default(0);
 
@@ -444,7 +444,7 @@ class CreateUsersTable extends Migration
             $t->unsignedInteger('company_id')->index();
 
             $t->unsignedInteger('status_id')->index();
-            $t->text('invoice_number')->default('');
+            $t->text('invoice_number')->nullable();
 
             $t->float('discount')->default(0);
             $t->boolean('is_amount_discount')->default(false);
@@ -507,7 +507,7 @@ class CreateUsersTable extends Migration
 
             $t->float('discount')->default(0);
             $t->boolean('is_amount_discount')->default(false);
-            $t->string('quote_number')->default('');
+            $t->string('quote_number')->nullable();
 
             $t->string('po_number')->default('');
             $t->date('quote_date')->nullable();
@@ -562,7 +562,7 @@ class CreateUsersTable extends Migration
             $t->unsignedInteger('company_id')->index();
             $t->unsignedInteger('status_id');
 
-            $t->string('quote_number')->default('');
+            $t->string('quote_number')->nullable();
             $t->float('discount')->default(0);
             $t->boolean('is_amount_discount')->default(false);
 
@@ -620,7 +620,7 @@ class CreateUsersTable extends Migration
             $t->timestamps(6);
             $t->softDeletes();
 
-            $t->string('transaction_reference')->default('');
+            $t->string('transaction_reference')->nullable();
             $t->string('message_id')->nullable();
             $t->text('email_error')->default('');
             $t->text('signature_base64')->default('');
@@ -704,7 +704,7 @@ class CreateUsersTable extends Migration
             $t->unsignedInteger('status_id')->index();
             $t->decimal('amount', 13, 2)->default(0);
             $t->datetime('payment_date')->nullable();
-            $t->string('transaction_reference')->default('');
+            $t->string('transaction_reference')->nullable();
             $t->string('payer_id')->default('');
             $t->timestamps(6);
             $t->softDeletes();