diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 9f4a8ea00..5a9669060 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -524,6 +524,7 @@ class AssetsController extends Controller
         $asset->last_checkout = null;
         $asset->assigned_to = null;
         $asset->accepted = null;
+        $asset->name = e(Input::get('name'));
 
 
         if (Input::has('status_id')) {
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index 481ad3d0b..2f6ec2cdb 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -29,6 +29,7 @@
       </div><!-- /.box-header -->
 
       <div class="box-body">
+        <div class="col-md-12">
 
         @if ($backto=='user')
         	<form class="form-horizontal" method="post" action="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}" autocomplete="off">
@@ -50,17 +51,17 @@
           </div>
         @endif
 
-        @if ($asset->name)
-          <!-- Asset name -->
+
+        <!-- Asset Name -->
           <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
             <div class="col-md-3">
               {{ Form::label('name', trans('admin/hardware/form.name')) }}
             </div>
             <div class="col-md-9">
-              <p class="form-control-static">{{ $asset->name }}</p>
+              <input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
+              {!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
             </div>
           </div>
-        @endif
 
         <!-- Status -->
         <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
@@ -101,7 +102,7 @@
         </div>
 
 
-
+        </div>
       </div>
       <div class="box-footer">
         <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>