diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php
index 57bc1fc..fb80a23 100644
--- a/app/Http/Controllers/OrderController.php
+++ b/app/Http/Controllers/OrderController.php
@@ -58,20 +58,23 @@ class OrderController extends Controller
 		// Check we have the custom attributes for the product
 		$options = $po->orderValidation($request);
 
-		$uo = User::firstOrNew(['email'=>$request->input('order_email') ?: $request->input('order_email_manual')]);
-
-		// If this is a new client
-		if (! $uo->exists)
+		if ($request->input('order_email_manual'))
 		{
-			// @todo Make this automatic
-			$uo->site_id = config('SITE_SETUP')->id;
-			$uo->active = FALSE;
-			$uo->firstname = '';
-			$uo->lastname = '';
-			$uo->country_id = config('SITE_SETUP')->country_id; // @todo This might be wrong
-			$uo->parent_id = Auth::id() ?: 1; // @todo This should be configured to a default user
-			$uo->active = 1;
-			$uo->save();
+			$uo = User::firstOrNew(['email'=>$request->input('order_email_manual')]);
+
+			// If this is a new client
+			if (! $uo->exists)
+			{
+				// @todo Make this automatic
+				$uo->site_id = config('SITE_SETUP')->id;
+				$uo->active = FALSE;
+				$uo->firstname = '';
+				$uo->lastname = '';
+				$uo->country_id = config('SITE_SETUP')->country_id; // @todo This might be wrong
+				$uo->parent_id = Auth::id() ?: 1; // @todo This should be configured to a default user
+				$uo->active = 1;
+				$uo->save();
+			}
 		}
 
 		// If we have a new account.
@@ -88,10 +91,7 @@ class OrderController extends Controller
 			$uo->accounts()->save($ao);
 
 		} else {
-			// @todo This logic may be wrong, if account_id is not set, it'll pick the first account, which may be wrong.
-			$ao = $request->input('account_id')
-				? $uo->accounts->where('account_id',$request->input('account_id'))
-				: $uo->accounts->first();
+			$ao = Account::findOrFail($request->input('account_id'));
 		}
 
 		$so = new Service;
diff --git a/resources/theme/frontend/metronic/order.blade.php b/resources/theme/frontend/metronic/order.blade.php
index f6d68f2..276a228 100644
--- a/resources/theme/frontend/metronic/order.blade.php
+++ b/resources/theme/frontend/metronic/order.blade.php
@@ -52,7 +52,7 @@
 																<div class="tab-content">
 																	<div class="tab-pane row fade in active" id="account_exist">
 																		<div class="control-group form-group col-sm-12 {{ $errors->has('account_id') ? 'has-error' : '' }}">
-																			<label for="order_email">Client Account</label>
+																			<label for="account_id">Client Account</label>
 																			<select class="form-control" id="account_id" name="account_id">
 																				<option value="">&nbsp;</option>
 																				@foreach ($user->all_accounts()->sortBy('company') as $o)
@@ -108,7 +108,7 @@
 																<div class="tab-content">
 																	<div class="tab-pane row fade in active" id="account_exist">
 																		<div class="control-group form-group col-sm-12 {{ $errors->has('account_id') ? 'has-error' : '' }}">
-																			<label for="order_email">Existing Account</label>
+																			<label for="account_id">Existing Account</label>
 																			<select class="form-control" id="account_id" name="account_id">
 																				<option value="">&nbsp;</option>
 																				@foreach ($user->accounts->sortBy('company') as $o)
@@ -185,7 +185,7 @@
 														</div>
 
 														<div class="control-group form-group col-sm-6 {{ $errors->has('product_id') ? 'has-error' : '' }}">
-															<label for="order_email">Product</label>
+															<label for="product_id">Product</label>
 															<select class="form-control" id="product_id" name="product_id">
 																<option value="">&nbsp;</option>
 																@php