diff --git a/app/Models/Account.php b/app/Models/Account.php
index 4df4ac9..7a6c7ea 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -72,7 +72,7 @@ class Account extends Model
 
 	public function getSwitchUrlAttribute()
 	{
-		return sprintf('<a href="/a/switch/start/%s"><i class="fa fa-external-link"></i></a>',$this->user_id);
+		return sprintf('<a href="/r/switch/start/%s"><i class="fa fa-external-link"></i></a>',$this->user_id);
 	}
 
 	private function _address()
diff --git a/resources/theme/frontend/metronic/order.blade.php b/resources/theme/frontend/metronic/order.blade.php
index 185a4b3..69bec0a 100644
--- a/resources/theme/frontend/metronic/order.blade.php
+++ b/resources/theme/frontend/metronic/order.blade.php
@@ -87,8 +87,8 @@
 																			<label for="order_email">Client Account</label>
 																			<select class="form-control" id="order_email" name="order_email">
 																				<option value="">&nbsp;</option>
-																				@foreach ($user->all_clients()->sortBy('sur_first_name') as $o)
-																					<option value="{{ $o->email }}" @if($o->email == old('order_email')) selected @endif>{{ $o->sur_first_name }}</option>
+																				@foreach ($user->all_accounts()->sortBy('company') as $o)
+																					<option value="{{ $o->user->email }}" @if($o->user->email == old('order_email')) selected @endif>{{ $o->company }}</option>
 																				@endforeach
 																			</select>
 																			<span class="help-block">{{ $errors->first('order_email') }}</span>
diff --git a/routes/web.php b/routes/web.php
index 469697d..f1ab494 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -21,7 +21,6 @@ Route::get('image/generic/{width}/{height}/{color}/{name?}','MediaController@ima
 Route::group(['middleware'=>['theme:adminlte-be','auth','role:wholesaler'],'prefix'=>'a'], function() {
 	Route::get('setup','AdminHomeController@setup');
 	Route::post('setup','AdminHomeController@setup_update');
-	Route::get('switch/start/{id}','\Leenooks\Controllers\AdminController@user_switch_start')->name('switch.user.stop');
 
 	//Route::get('accounting/connect', 'AccountingController@connect');
 });
@@ -33,6 +32,7 @@ Route::group(['middleware'=>['theme:adminlte-be','auth','role:reseller'],'prefix
 	Route::get('supplier/index', 'SuppliersController@index');
 	Route::get('supplier/create', 'SuppliersController@create');
 	Route::post('supplier/store', 'SuppliersController@store');
+	Route::get('switch/start/{id}','\Leenooks\Controllers\AdminController@user_switch_start')->name('switch.user.stop');
 	Route::get('home/{o}', 'UserHomeController@user');
 });