diff --git a/app/libraries/utils.php b/app/libraries/utils.php
index 73408ddfbaf5..b6749b39b636 100755
--- a/app/libraries/utils.php
+++ b/app/libraries/utils.php
@@ -79,7 +79,11 @@ class Utils
 
 		static::logError($message . ' ' . $exception);		
 
-		return View::make('error')->with('error', $message);
+		$data = [
+			'showBreadcrumbs' => false
+		];
+
+		return View::make('error', $data)->with('error', $message);
 	}
 
 	public static function logError($error, $context = 'PHP')
diff --git a/app/ninja/mailers/UserMailer.php b/app/ninja/mailers/UserMailer.php
index 3c2c8c526f80..ab25f0426081 100755
--- a/app/ninja/mailers/UserMailer.php
+++ b/app/ninja/mailers/UserMailer.php
@@ -40,7 +40,7 @@ class UserMailer extends Mailer {
 			'userName' => $user->getDisplayName(),
 			'invoiceAmount' => Utils::formatMoney($invoice->amount, $invoice->client->currency_id),
 			'invoiceNumber' => $invoice->invoice_number,
-			'invoiceLink' => "http://www.invoiceninja.com/invoices/{$invoice->public_id}"			
+			'invoiceLink' => "http://".$_SERVER['SERVER_NAME']."/invoices/{$invoice->public_id}"			
 		];
 
 		if ($payment)
diff --git a/app/ninja/repositories/AccountRepository.php b/app/ninja/repositories/AccountRepository.php
index eb9d3f6ad241..6fa1184069a4 100755
--- a/app/ninja/repositories/AccountRepository.php
+++ b/app/ninja/repositories/AccountRepository.php
@@ -206,6 +206,7 @@ class AccountRepository
 
 			$contact = new Contact;
 			$contact->user_id = $ninjaAccount->users()->first()->id;
+			$contact->public_id = Auth::user()->account_id;
 			$contact->is_primary = true;
 			foreach (['first_name', 'last_name', 'email', 'phone'] as $field) 
 			{
diff --git a/app/routes.php b/app/routes.php
index 7dd66aa8b7f8..a50d77f6588d 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -189,7 +189,7 @@ define('GATEWAY_PAYPAL_EXPRESS', 17);
 define('GATEWAY_BEANSTREAM', 29);
 define('GATEWAY_PSIGATE', 30);
 
-define('PRO_PLAN_PRICE', 50); 
+define('PRO_PLAN_PRICE', 50);
 define('REQUESTED_PRO_PLAN', 'REQUESTED_PRO_PLAN');
 define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
 define('NINJA_GATEWAY_ID', GATEWAY_AUTHORIZE_NET);