diff --git a/src/app/Observers/SignupCodeObserver.php b/src/app/Observers/SignupCodeObserver.php
index 8c832697..7f987cf2 100644
--- a/src/app/Observers/SignupCodeObserver.php
+++ b/src/app/Observers/SignupCodeObserver.php
@@ -1,67 +1,76 @@
 <?php
 
 namespace App\Observers;
 
 use App\SignupCode;
 use Carbon\Carbon;
 use Illuminate\Support\Str;
 
 class SignupCodeObserver
 {
     /**
      * Handle the "creating" event.
      *
      * Ensure that the code entry is created with a random code/short_code.
      *
      * @param \App\SignupCode $code The code being created.
      *
      * @return void
      */
     public function creating(SignupCode $code): void
     {
         $code_length = SignupCode::CODE_LENGTH;
         $exp_hours   = env('SIGNUP_CODE_EXPIRY', SignupCode::CODE_EXP_HOURS);
 
         if (empty($code->code)) {
             $code->short_code = SignupCode::generateShortCode();
 
             // FIXME: Replace this with something race-condition free
             while (true) {
                 $code->code = Str::random($code_length);
                 if (!SignupCode::find($code->code)) {
                     break;
                 }
             }
         }
 
+        $code->headers = collect(request()->headers->all())
+            ->filter(function ($value, $key) {
+                // remove some headers we don't care about
+                return !in_array($key, ['cookie', 'referer', 'x-test-payment-provider', 'origin']);
+            })
+            ->map(function ($value) {
+                return is_array($value) && count($value) == 1 ? $value[0] : $value;
+            });
+
         $code->expires_at = Carbon::now()->addHours($exp_hours);
         $code->ip_address = request()->ip();
 
         if ($code->email) {
             $parts = explode('@', $code->email);
 
             $code->local_part = $parts[0];
             $code->domain_part = $parts[1];
         }
     }
 
     /**
      * Handle the "updating" event.
      *
      * @param SignupCode $code The code being updated.
      *
      * @return void
      */
     public function updating(SignupCode $code)
     {
         if ($code->email) {
             $parts = explode('@', $code->email);
 
             $code->local_part = $parts[0];
             $code->domain_part = $parts[1];
         } else {
             $code->local_part = null;
             $code->domain_part = null;
         }
     }
 }
diff --git a/src/app/SignupCode.php b/src/app/SignupCode.php
index 29e43e2a..73ecd7af 100644
--- a/src/app/SignupCode.php
+++ b/src/app/SignupCode.php
@@ -1,104 +1,106 @@
 <?php
 
 namespace App;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * The eloquent definition of a SignupCode.
  *
  * @property string         $code        The full code identifier
  * @property \Carbon\Carbon $created_at  The creation timestamp
  * @property \Carbon\Carbon $deleted_at  The deletion timestamp
  * @property string         $domain_part Email domain
  * @property string         $email       Email address
  * @property \Carbon\Carbon $expires_at  The code expiration timestamp
  * @property string         $first_name  Firstname
  * @property string         $ip_address  IP address the request came from
  * @property string         $last_name   Lastname
  * @property string         $local_part  Email local part
  * @property string         $plan        Plan title
  * @property string         $short_code  Short validation code
  * @property \Carbon\Carbon $updated_at  The update timestamp
  * @property string         $voucher     Voucher discount code
  */
 class SignupCode extends Model
 {
     use SoftDeletes;
 
     public const SHORTCODE_LENGTH  = 5;
     public const CODE_LENGTH       = 32;
 
     // Code expires after so many hours
     public const CODE_EXP_HOURS    = 24;
 
 
     /**
      * The primary key associated with the table.
      *
      * @var string
      */
     protected $primaryKey = 'code';
 
     /**
      * Indicates if the IDs are auto-incrementing.
      *
      * @var bool
      */
     public $incrementing = false;
 
     /**
      * The "type" of the auto-incrementing ID.
      *
      * @var string
      */
     protected $keyType = 'string';
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
         'code',
         'email',
         'expires_at',
         'first_name',
         'last_name',
         'plan',
         'short_code',
         'voucher'
     ];
 
+    protected $casts = ['headers' => 'array'];
+
     /**
      * The attributes that should be mutated to dates.
      *
      * @var array
      */
     protected $dates = ['expires_at'];
 
     /**
      * Check if code is expired.
      *
      * @return bool True if code is expired, False otherwise
      */
     public function isExpired()
     {
         // @phpstan-ignore-next-line
         return $this->expires_at ? Carbon::now()->gte($this->expires_at) : false;
     }
 
     /**
      * Generate a short code (for human).
      *
      * @return string
      */
     public static function generateShortCode(): string
     {
         $code_length = env('SIGNUP_CODE_LENGTH', self::SHORTCODE_LENGTH);
 
         return \App\Utils::randStr($code_length);
     }
 }
diff --git a/src/database/migrations/2021_04_08_150000_signup_code_headers.php b/src/database/migrations/2021_04_08_150000_signup_code_headers.php
new file mode 100644
index 00000000..037b8298
--- /dev/null
+++ b/src/database/migrations/2021_04_08_150000_signup_code_headers.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+// phpcs:ignore
+class SignupCodeHeaders extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table(
+            'signup_codes',
+            function (Blueprint $table) {
+                $table->text('headers')->nullable();
+            }
+        );
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table(
+            'signup_codes',
+            function (Blueprint $table) {
+                $table->dropColumn('headers');
+            }
+        );
+    }
+}