diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 4643d69de5..61af6ce424 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -92,15 +92,19 @@ class AssetsController extends AdminController
      */
     public function getCreate()
     {
+
         // Grab the dropdown list of models
         $model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id');
         $supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
         $assigned_to = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
         $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id');
 
+
         // Grab the dropdown list of status
         $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
 
+
+
         return View::make('backend/hardware/edit')->with('supplier_list',$supplier_list)->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list)->with('assigned_to',$assigned_to)->with('location_list',$location_list)->with('asset',new Asset);
 
     }
diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php
index cd74426154..017a91d4a2 100755
--- a/app/controllers/admin/SettingsController.php
+++ b/app/controllers/admin/SettingsController.php
@@ -87,6 +87,8 @@ class SettingsController extends AdminController
             $setting->qr_code = e(Input::get('qr_code', '0'));
             $setting->display_eol = e(Input::get('display_eol', '0'));
             $setting->qr_text = e(Input::get('qr_text'));
+            $setting->auto_increment_prefix = e(Input::get('auto_increment_prefix'));
+            $setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));
 
             // Was the asset updated?
             if($setting->save()) {
diff --git a/app/database/migrations/2014_11_20_223947_add_auto_to_settings.php b/app/database/migrations/2014_11_20_223947_add_auto_to_settings.php
new file mode 100644
index 0000000000..3d3a4765f7
--- /dev/null
+++ b/app/database/migrations/2014_11_20_223947_add_auto_to_settings.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAutoToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->integer('auto_increment_assets')->default(0);
+
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->dropColumn('auto_increment_assets');
+
+		});
+	}
+
+}
diff --git a/app/database/migrations/2014_11_20_224421_add_prefix_to_settings.php b/app/database/migrations/2014_11_20_224421_add_prefix_to_settings.php
new file mode 100644
index 0000000000..dff67400b2
--- /dev/null
+++ b/app/database/migrations/2014_11_20_224421_add_prefix_to_settings.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPrefixToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->string('auto_increment_prefix')->default(0);
+
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->dropColumn('auto_increment_prefix');
+
+		});
+	}
+
+}
diff --git a/app/lang/en/admin/settings/general.php b/app/lang/en/admin/settings/general.php
index 2434669cb8..3aac5a6e96 100755
--- a/app/lang/en/admin/settings/general.php
+++ b/app/lang/en/admin/settings/general.php
@@ -1,6 +1,8 @@
 <?php
 
 return array(
+	'auto_increment_assets'     => 'Auto-generate asset tags',
+	'auto_increment_prefix'     => 'Auto-generated asset tag prefix',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
diff --git a/app/models/Asset.php b/app/models/Asset.php
index fd22168aac..f04160296a 100755
--- a/app/models/Asset.php
+++ b/app/models/Asset.php
@@ -203,4 +203,23 @@ class Asset extends Elegant
             date_add($date, date_interval_create_from_date_string($this->model->eol.' months'));
             return date_format($date, 'Y-m-d');
     }
+
+
+    /**
+    * Get total assets
+    */
+     public static function autoincrement_asset()
+    {
+        $settings = Setting::getSettings();
+		if ($settings->auto_increment_assets == '1') {
+			$asset_tag = DB::table('assets')
+                    ->where('physical', '=', '1')
+                    ->orderBy('created_at','desc')
+                    ->first();
+			return $settings->auto_increment_prefix.($asset_tag->id + 1);
+		} else {
+			return false;
+		}
+
+    }
 }
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
index 8d1d0ddd5b..0cd28ca5f5 100755
--- a/app/views/backend/hardware/edit.blade.php
+++ b/app/views/backend/hardware/edit.blade.php
@@ -46,7 +46,12 @@
                  <i class='icon-asterisk'></i></label>
                  </label>
                     <div class="col-md-7">
-                        <input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{{ Input::old('asset_tag', $asset->asset_tag) }}}" />
+                    	@if  ($asset->id)
+							<input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{{ Input::old('asset_tag', $asset->asset_tag) }}}" />
+						@else
+							<input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{{ Input::old('asset_tag', Asset::autoincrement_asset()) }}}" />
+						@endif
+
                         {{ $errors->first('asset_tag', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
                     </div>
             </div>
diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
index 655f0d0b29..e56c9e57d5 100755
--- a/app/views/backend/settings/edit.blade.php
+++ b/app/views/backend/settings/edit.blade.php
@@ -38,7 +38,7 @@ padding: 0px 20px;
                 <h3 class="name">@lang('admin/settings/general.update')</h3>
 
 
-                <div class="row-fluid profile">
+                <div class="profile">
                     <!-- bio, new note & orders column -->
                     <div class="col-md-9 bio">
                         <div class="profile-box">
@@ -86,6 +86,33 @@ padding: 0px 20px;
 											@lang('admin/settings/general.display_checkout_date')
 										</label>
                                     </div>
+                                    <hr>
+
+                                    <div class="checkbox">
+										<label>
+											{{ Form::checkbox('auto_increment_assets', '1', Input::old('auto_increment_assets', $setting->auto_increment_assets)) }}
+											@lang('admin/settings/general.auto_increment_assets')
+										</label>
+                                    </div>
+
+                                    <div class="form-group {{ $errors->has('auto_increment_prefix') ? 'error' : '' }}">
+                                            {{ Form::label('auto_increment_prefix', Lang::get('admin/settings/general.auto_increment_prefix')) }}
+
+                                         @if ($setting->auto_increment_assets == 1)
+											{{ Form::text('auto_increment_prefix', Input::old('auto_increment_prefix', $setting->auto_increment_prefix), array('class' => 'form-control', 'style'=>'width: 100px;')) }}
+											{{ $errors->first('auto_increment_prefix', '<span class="help-inline">:message</span>') }}
+										@else
+											{{ Form::text('auto_increment_prefix', Input::old('auto_increment_prefix', $setting->auto_increment_prefix), array('class' => 'form-control', 'disabled'=>'disabled', 'style'=>'width: 100px;')) }}
+											<p class="help-inline">
+                                                @lang('admin/settings/general.qr_help')
+                                            </p>
+										@endif
+
+
+                                    </div>
+
+
+
 									<hr>
 
                                     @if ($is_gd_installed)
diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php
index 58e61956cb..3262afb283 100755
--- a/app/views/backend/settings/index.blade.php
+++ b/app/views/backend/settings/index.blade.php
@@ -61,6 +61,23 @@
                                             <td>@lang('general.no')</td>
                                         @endif
                                     </tr>
+
+                                    <tr>
+                                        <td>@lang('admin/settings/general.auto_increment_assets')</td>
+
+                                        @if ($setting->auto_increment_assets == 1)
+                                            <td>@lang('general.yes')</td>
+                                        @else
+                                            <td>@lang('general.no')</td>
+                                        @endif
+                                    </tr>
+
+                                    <tr>
+                                        <td>@lang('admin/settings/general.auto_increment_prefix')</td>
+                                        <td>{{{ $setting->auto_increment_prefix }}}</td>
+                                    </tr>
+
+
                                     <tr>
                                         <td>@lang('admin/settings/general.per_page')</td>
                                         <td>{{{ $setting->per_page }}}  </td>