diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 395d4a0f242d..4f153f78ef2b 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -38,7 +38,7 @@ class HomeController extends BaseController
     public function showIndex()
     {
         Session::reflash();
-        
+
         if (!Utils::isNinja() && (!Utils::isDatabaseSetup() || Account::count() == 0)) {
             return Redirect::to('/setup');
         } elseif (Auth::check()) {
@@ -76,10 +76,8 @@ class HomeController extends BaseController
         }
 
         // Track the referral/campaign code
-        foreach (['rc', 'utm_campaign'] as $code) {
-            if (Input::has($code)) {
-                Session::set(SESSION_REFERRAL_CODE, Input::get($code));
-            }
+        if (Input::has('rc')) {
+            Session::set(SESSION_REFERRAL_CODE, Input::get('rc'));
         }
 
         if (Auth::check()) {
@@ -115,7 +113,7 @@ class HomeController extends BaseController
                 $user->save();
             }
         }
-        
+
         Session::forget('news_feed_message');
 
         return 'success';
diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 01eb49e70fac..b80bd1321e88 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -2,6 +2,7 @@
 
 use Auth;
 use Request;
+use Input;
 use Session;
 use Utils;
 use URL;
@@ -27,6 +28,11 @@ class AccountRepository
     public function create($firstName = '', $lastName = '', $email = '', $password = '')
     {
         $company = new Company();
+        $company->utm_source = Input::get('utm_source');
+        $company->utm_medium = Input::get('utm_medium');
+        $company->utm_campaign = Input::get('utm_campaign');
+        $company->utm_term = Input::get('utm_term');
+        $company->utm_content = Input::get('utm_content');
         $company->save();
 
         $account = new Account();
diff --git a/resources/views/public/invoice_now.blade.php b/resources/views/public/invoice_now.blade.php
index b18c37965395..71241e748540 100644
--- a/resources/views/public/invoice_now.blade.php
+++ b/resources/views/public/invoice_now.blade.php
@@ -2,7 +2,7 @@
 
 @section('body')
 
-{!! Form::open(array('url' => 'get_started', 'id' => 'startForm')) !!}
+{!! Form::open(array('url' => 'get_started?' . request()->getQueryString(), 'id' => 'startForm')) !!}
 {!! Form::hidden('guest_key') !!}
 {!! Form::hidden('sign_up', Input::get('sign_up')) !!}
 {!! Form::hidden('redirect_to', Input::get('redirect_to')) !!}
@@ -34,4 +34,4 @@
   }
 </script>
 
-@stop
\ No newline at end of file
+@stop