diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php
index 55acb3d864..cf7b0867e8 100644
--- a/app/controllers/admin/SettingsController.php
+++ b/app/controllers/admin/SettingsController.php
@@ -83,6 +83,7 @@ class SettingsController extends AdminController {
 		// Update the asset data
 			$setting->id = '1';
 			$setting->site_name = e(Input::get('site_name'));
+			$setting->display_asset_name = e(Input::get('display_asset_name', '0'));
 			$setting->per_page = e(Input::get('per_page'));
 			$setting->qr_code = e(Input::get('qr_code', '0'));
 			$setting->qr_text = e(Input::get('qr_text'));
diff --git a/app/database/migrations/2014_06_19_191508_add_asset_name_to_settings.php b/app/database/migrations/2014_06_19_191508_add_asset_name_to_settings.php
new file mode 100644
index 0000000000..f2990243ec
--- /dev/null
+++ b/app/database/migrations/2014_06_19_191508_add_asset_name_to_settings.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAssetNameToSettings extends Migration {
+
+	 /**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('settings', function($table)
+		{
+			$table->integer('display_asset_name')->nullable()->default(NULL);
+
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('settings', function($table)
+		{
+			$table->dropColumn('display_asset_name');
+		});
+	}
+
+}
diff --git a/app/lang/en/admin/settings/general.php b/app/lang/en/admin/settings/general.php
index e4a53f4050..523f7953da 100644
--- a/app/lang/en/admin/settings/general.php
+++ b/app/lang/en/admin/settings/general.php
@@ -10,5 +10,6 @@ return array(
 	'setting'					=> 'Setting',
 	'title'  					=> 'Settings',
 	'update'  					=> 'Update Settings',
-	'value'					=> 'Value',
+	'value'						=> 'Value',
+	'display_asset_name'		=> 'Display Asset Name',
 );
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index 3f01020548..9c24f4ec49 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -44,6 +44,9 @@
 		<tr role="row">
 			<th class="col-md-1" bSortable="true">@lang('admin/hardware/table.asset_tag')</th>
 			<th class="col-md-3" bSortable="true">@lang('admin/hardware/table.title')</th>
+			@if (Setting::getSettings()->display_asset_name)
+			<th class="col-md-3" bSortable="true">@lang('general.name')</th>
+			@endif
 			<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.serial')</th>
 			@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD'))
 			<th class="col-md-2" bSortable="true">@lang('general.status')</th>
@@ -62,6 +65,9 @@
 		<tr>
 			<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->asset_tag }}</a></td>
 			<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->model->name }}</a></td>
+			@if (Setting::getSettings()->display_asset_name)
+				<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->name }}</a></td>
+			@endif
 			<td>{{ $asset->serial }}</td>
 			@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD'))
 				<td>
diff --git a/app/views/backend/reports/index.blade.php b/app/views/backend/reports/index.blade.php
index 99a11101dd..7d34ce5cd0 100644
--- a/app/views/backend/reports/index.blade.php
+++ b/app/views/backend/reports/index.blade.php
@@ -27,6 +27,9 @@
 			<tr role="row">
 			<th class="col-sm-1">@lang('admin/hardware/table.asset_tag')</th>
 			<th class="col-sm-1">@lang('admin/hardware/table.title')</th>
+			@if (Setting::getSettings()->display_asset_name)
+				<th class="col-sm-1">@lang('general.name')</th>
+			@endif
 			<th class="col-sm-1">@lang('admin/hardware/table.serial')</th>
 			<th class="col-sm-1">@lang('admin/hardware/table.checkoutto')</th>
 			<th class="col-sm-1">@lang('admin/hardware/table.location')</th>
@@ -43,6 +46,9 @@
 		<tr>
 			<td>{{ $asset->asset_tag }}</td>
 			<td>{{ $asset->model->name }}</td>
+			@if (Setting::getSettings()->display_asset_name)
+				<td>{{ $asset->name }}</td>
+			@endif
 			<td>{{ $asset->serial }}</td>
 			<td>
 			@if ($asset->assigned_to != 0)
diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
index 2318ef4b8f..318598407c 100755
--- a/app/views/backend/settings/edit.blade.php
+++ b/app/views/backend/settings/edit.blade.php
@@ -39,6 +39,21 @@
 											{{ $errors->first('site_name', '<span class="help-inline">:message</span>') }}
 										</div>
 									</div>
+
+									<div class="form-group {{ $errors->has('display_asset_name') ? 'error' : '' }}">
+										<label class="control-label" for="display_asset_name">
+										@lang('admin/settings/general.display_asset_name')
+										</label>
+										<div class="controls">
+
+											<input class="col-md-1" type="checkbox" name="display_asset_name" id="display_asset_name" value="1" {{ $setting->display_asset_name === '1' ? 'checked' : '' }} />
+
+											{{ $errors->first('display_asset_name', '<span class="help-inline">:message</span>') }}
+											</div>
+									</div>
+
+
+
 									<div class="form-group {{ $errors->has('per_page') ? 'error' : '' }}">
 										<label class="control-label" for="per_page">Results Per Page</label>
 										<div class="controls">
diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php
index 1ca1823fdc..a05821144f 100755
--- a/app/views/backend/settings/index.blade.php
+++ b/app/views/backend/settings/index.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-@lang('admin/settings/general.title') ::
+Settings ::
 @parent
 @stop
 
@@ -16,7 +16,7 @@
 				</div>
 
 
-				<h3 class="name">@lang('admin/settings/general.title')</h3>
+				<h3 class="name">Settings</h3>
 
 
                 <div class="row-fluid profile">
@@ -29,22 +29,33 @@
                             <table class="table table-hover">
 							<thead>
 								<tr>
-									<th class="col-md-3">@lang('admin/settings/general.setting')</th>
-									<th class="col-md-3"><span class="line"></span>@lang('admin/settings/general.value')</th>
+									<th class="col-md-3">Setting</th>
+									<th class="col-md-3"><span class="line"></span>Value</th>
 								</tr>
 							</thead>
 							<tbody>
 								@foreach ($settings as $setting)
 								<tr>
-									<td>@lang('general.site_name')</td>
+									<td>Site Name</td>
 									<td>{{ $setting->site_name }}  </td>
 								</tr>
 								<tr>
-									<td>@lang('general.per_page')</td>
+									<td>@lang('admin/settings/general.display_asset_name')</td>
+
+
+@if ($setting->display_asset_name === '1')
+								<td>Yes</td>
+@else
+								<td>No</td>
+@endif
+								</tr>
+
+								<tr>
+									<td>Per Page</td>
 									<td>{{ $setting->per_page }}  </td>
 								</tr>
 								<tr>
-									<td>@lang('admin/settings/general.display_qr')</td>
+									<td>Display QR Codes</td>
 @if ($setting->qr_code === '1')
 								<td>Yes</td>
 @else
@@ -52,7 +63,7 @@
 @endif
 								</tr>
 <tr>
-									<td>@lang('admin/settings/general.qr_text')</td>
+									<td>QR Code Text</td>
 									<td>{{ $setting->qr_text }}</td>
 								</tr>
 								@endforeach
@@ -66,7 +77,7 @@
                     <div class="col-md-3 address pull-right">
 						<br /><br />
 
-						<p>@lang('admin/settings/general.info')</p>
+						<p>These settings let you customize certain aspects of your installation. </p>
 
                     </div>
 @stop
\ No newline at end of file