diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index dc1c5b1611..d2c8fe25d8 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -478,6 +478,11 @@ class SettingsController extends Controller
                 $setting->two_factor_enabled = null;
             } else {
                 $setting->two_factor_enabled = $request->input('two_factor_enabled');
+
+                # remote user login
+                $setting->login_remote_user_enabled = (int)$request->input('login_remote_user_enabled');
+                $setting->login_common_disabled= (int)$request->input('login_common_disabled');
+                $setting->login_remote_user_custom_logout_url = $request->input('login_remote_user_custom_logout_url');
             }
 
         }
@@ -486,10 +491,6 @@ class SettingsController extends Controller
         $setting->pwd_secure_min = (int) $request->input('pwd_secure_min');
         $setting->pwd_secure_complexity = '';
 
-        # remote user login
-        $setting->login_remote_user_enabled = (int)$request->input('login_remote_user_enabled');
-        $setting->login_common_disabled= (int)$request->input('login_common_disabled');
-        $setting->login_remote_user_custom_logout_url = $request->input('login_remote_user_custom_logout_url');
 
         if ($request->has('pwd_secure_complexity')) {
             $setting->pwd_secure_complexity =  implode('|', $request->input('pwd_secure_complexity'));
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 6a4398b2e3..5595b2d2b1 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -189,13 +189,7 @@ class Asset extends Depreciable
                 $this->location_id = $target->location->id;
             }
         }
-
-        if ($this->requireAcceptance()) {
-            if(get_class($target) != User::class) {
-                throw new CheckoutNotAllowed;
-            }
-            $this->accepted="pending";
-        }
+        
 
         if ($this->save()) {
             $this->logCheckout($note, $target);
diff --git a/app/Notifications/ExpectedCheckinNotification.php b/app/Notifications/ExpectedCheckinNotification.php
index d1562832a2..3dc41950d9 100644
--- a/app/Notifications/ExpectedCheckinNotification.php
+++ b/app/Notifications/ExpectedCheckinNotification.php
@@ -61,7 +61,7 @@ class ExpectedCheckinNotification extends Notification
         return (new MailMessage)
             ->error()
             ->subject('Reminder: '.$this->params->present()->name().' checkin deadline approaching')
-            ->line('Hi, '.$this->params->assignedto->first_name)
+            ->line('Hi, '.$this->params->assignedto->first_name.' '.$this->params->assignedto->last_name)
             ->greeting('An asset checked out to you is due to be checked back in on '.$formatted_due.'.')
             ->line('Asset: '.$this->params->present()->name())
             ->line('Serial: '.$this->params->serial)
diff --git a/config/database.php b/config/database.php
index c7f0b89d8b..183d30cf5e 100755
--- a/config/database.php
+++ b/config/database.php
@@ -78,7 +78,7 @@ return [
             'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
             'prefix'    => env('DB_PREFIX', null),
             'strict'    => false,
-            'engine'    => null,
+            'engine'    => 'InnoDB',
             'unix_socket' => env('DB_SOCKET',''),
             'dump_command_path' => env('DB_DUMP_PATH', '/usr/local/bin'),  // only the path, so without 'mysqldump'
             'dump_command_timeout' => 60 * 5, // 5 minute timeout
diff --git a/database/migrations/2018_04_16_133902_create_custom_field_default_values_table.php b/database/migrations/2018_04_16_133902_create_custom_field_default_values_table.php
index b8f9191a26..aea8509b8b 100644
--- a/database/migrations/2018_04_16_133902_create_custom_field_default_values_table.php
+++ b/database/migrations/2018_04_16_133902_create_custom_field_default_values_table.php
@@ -17,7 +17,7 @@ class CreateCustomFieldDefaultValuesTable extends Migration
             $table->increments('id');
             $table->integer('asset_model_id');
             $table->integer('custom_field_id');
-            $table->text('default_value')->nullable();
+            $table->text('default_value')->nullable()->default(null);
         });
     }
 
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 2fc2242649..52ec0da75e 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -17,7 +17,7 @@ else
 fi
 
 # create data directories
-for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/barcodes' 'data/uploads/categories' 'data/uploads/companies' 'data/uploads/departments' 'data/uploads/locations' 'data/uploads/manufacturers' 'data/uploads/models' 'data/uploads/suppliers' 'dumps'; do
+for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/barcodes' 'data/uploads/categories' 'data/uploads/companies' 'data/uploads/departments' 'data/uploads/locations' 'data/uploads/manufacturers' 'data/uploads/models' 'data/uploads/suppliers' 'dumps' 'keys'; do
 	mkdir -p "/var/lib/snipeit/$dir"
 done
 
diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index b1679b1268..753fbb0d71 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -86,7 +86,7 @@ return array(
     'login_common_disabled_text' => 'Disable other authentication mechanisms',
     'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
     'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
-    'login_remote_user_custom_logout_url_help' => 'If filled users will get redirected to this URL after the Session of SnipeIT is closed (Logout). This is usefull to close the user sessions of your Authenticationprovider correctly.',
+    'login_remote_user_custom_logout_url_help' => 'If filled users will get redirected to this URL after the Session of SnipeIT is closed (Logout). This is useful to close the user sessions of your Authentication provider correctly.',
     'logo'                    	=> 'Logo',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php
index 74a2878033..295de1454b 100755
--- a/resources/views/accessories/checkout.blade.php
+++ b/resources/views/accessories/checkout.blade.php
@@ -79,6 +79,14 @@
                      </div>
                  </div>
              @endif
+          <!-- Note -->
+          <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+            <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
+            <div class="col-md-7">
+              <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $accessory->note) }}</textarea>
+              {!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
+            </div>
+          </div>
        </div>
        <div class="box-footer">
           <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index f4e1b40432..99f4ae96f7 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -66,7 +66,14 @@
                 </div>
               </div>
             @endif
-
+          <!-- Note -->
+          <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+            <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
+            <div class="col-md-7">
+              <textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $consumable->note) }}</textarea>
+              {!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
+            </div>
+          </div>
         </div> <!-- .box-body -->
         <div class="box-footer">
           <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 1823db3863..4a5203c36d 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -47,23 +47,13 @@
                 @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
 
                 @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'required'=>'true'])
-            @if ($asset->requireAcceptance())
-                    <div class="form-group">
 
-                        <div class="col-md-8 col-md-offset-3">
-                            <p class="help-block">
-                                Because this asset category requires acceptance,
-                                it cannot be checked out to another asset or to a location.
-                            </p>
-                        </div>
-                    </div>
-            @else
                 <!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->
                 @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;', 'required'=>'true'])
 
                 @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required'=>'true'])
 
-            @endif
+
 
             <!-- Checkout/Checkin Date -->
             <div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 72b624e94b..43b6b65ab6 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -811,12 +811,13 @@
                       data-cookie-id-table="assetFileHistory">
                 <thead>
                   <tr>
-                    <th data-visible="true"></th>
-                    <th class="col-md-2" data-searchable="true" data-visible="true">{{ trans('general.notes') }}</th>
-                    <th class="col-md-2" data-searchable="true" data-visible="true">{{ trans('general.image') }}</th>
-                    <th class="col-md-2" data-searchable="true" data-visible="true">{{ trans('general.file_name') }}</th>
-                    <th class="col-md-2" data-searchable="true" data-visible="true">{{ trans('general.download') }}</th>
-                    <th class="col-md-1" data-searchable="true" data-visible="true">{{ trans('general.actions') }}</th>
+                    <th data-visible="true" data-field="icon"></th>
+                    <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes">{{ trans('general.notes') }}</th>
+                    <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
+                    <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename">{{ trans('general.file_name') }}</th>
+                    <th class="col-md-2" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
+                    <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at">{{ trans('general.created_at') }}</th>
+                    <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -831,7 +832,9 @@
                         </td>
                         <td>
                           @if ( \App\Helpers\Helper::checkUploadIsImage($file->get_src('assets')))
-                            <a href="{{ route('show/assetfile', ['assetId' => $asset->id, 'fileId' =>$file->id]) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show/assetfile', ['assetId' => $asset->id, 'fileId' =>$file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
+                            <a href="{{ route('show/assetfile', ['assetId' => $asset->id, 'fileId' =>$file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}" data-footer="{{ \App\Helpers\Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}">
+                              <img src="{{ route('show/assetfile', ['assetId' => $asset->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;">
+                            </a>
                           @endif
                         </td>
                         <td>
@@ -842,6 +845,14 @@
                           <a href="{{ route('show/assetfile', [$asset->id, $file->id]) }}" class="btn btn-default"><i class="fa fa-download"></i></a>
                           @endif
                         </td>
+
+                        <td>
+                          @if ($file->created_at)
+                            {{ \App\Helpers\Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
+                          @endif
+                        </td>
+
+
                         <td>
                           @can('update', \App\Models\Asset::class)
                             <a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/assetfile', [$asset->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('delete_confirm', ['item' => $file->filename]) }}"><i class="fa fa-trash icon-white"></i></a>
@@ -870,11 +881,6 @@
 @section('moar_scripts')
   @include ('partials.bootstrap-table')
 
-<script nonce="{{ csrf_token() }}">
-    $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
-        event.preventDefault();
-        $(this).ekkoLightbox();
-    });
-</script>
+
 
 @stop
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index c8ce11de74..c2cb62d851 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -155,7 +155,14 @@
 
                 return '<nobr><a href="{{ url('/') }}/' + destination + '/' + value.id + '" data-tooltip="true" title="'+ status_meta[value.status_meta] + '"> <i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + value.name + ' ' + text_help + ' </a> </nobr>';
             } else if ((value) && (value.name)) {
-                return '<nobr><a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a></span>';
+
+                // Add some overrides for any funny urls we have
+                var dest = destination;
+                if (destination=='fieldsets') {
+                    var dest = 'fields/fieldsets';
+                }
+
+                return '<nobr><a href="{{ url('/') }}/' + dest + '/' + value.id + '"> ' + value.name + '</a></span>';
             }
         };
     }
@@ -166,10 +173,13 @@
 
             var actions = '<nobr>';
 
+            // Add some overrides for any funny urls we have
             var dest = destination;
+
             if (destination=='groups') {
                 var dest = 'admin/groups';
             }
+
             if (destination=='maintenances') {
                 var dest = 'hardware/maintenances';
             }
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index 26052cec22..e9589b1691 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -123,27 +123,33 @@
                             </div>
                             <div class="col-md-9">
                                 <!--  Enable Remote User Login -->
-                                {{ Form::checkbox('login_remote_user_enabled', '1', Input::old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('class' => 'minimal')) }}
-                                {{ Form::label('login_remote_user_enabled',  trans('admin/settings/general.login_remote_user_enabled_text')) }}
-                                {!! $errors->first('login_remote_user_enabled', '<span class="alert-msg">:message</span>') !!}
-                                <p class="help-block">
-                                    {{ trans('admin/settings/general.login_remote_user_enabled_help') }}
-                                </p>
-                                <!-- Custom logout url to redirect to authentication provider -->
-                                {{ Form::label('login_remote_user_custom_logout_url',  trans('admin/settings/general.login_remote_user_custom_logout_url_text')) }}
-                                {{ Form::text('login_remote_user_custom_logout_url', Input::old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url),array('class' => 'form-control')) }}
 
-                                {!! $errors->first('login_remote_user_custom_logout_url', '<span class="alert-msg">:message</span>') !!}
-                                <p class="help-block">
-                                    {{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }}
-                                </p>
-                                <!--  Disable other logins mechanism -->
-                                {{ Form::checkbox('login_common_disabled', '1', Input::old('login_common_disabled', $setting->login_common_disabled),array('class' => 'minimal')) }}
-                                {{ Form::label('login_common_disabled',  trans('admin/settings/general.login_common_disabled_text')) }}
-                                {!! $errors->first('login_common_disabled', '<span class="alert-msg">:message</span>') !!}
-                                <p class="help-block">
-                                    {{ trans('admin/settings/general.login_common_disabled_help') }}
-                                </p>
+                                @if (config('app.lock_passwords'))
+                                    <p class="help-block">{{ trans('general.feature_disabled') }}</p>
+                                @else
+                                    {{ Form::checkbox('login_remote_user_enabled', '1', Input::old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('class' => 'minimal')) }}
+                                    {{ Form::label('login_remote_user_enabled',  trans('admin/settings/general.login_remote_user_enabled_text')) }}
+                                    {!! $errors->first('login_remote_user_enabled', '<span class="alert-msg">:message</span>') !!}
+                                    <p class="help-block">
+                                        {{ trans('admin/settings/general.login_remote_user_enabled_help') }}
+                                    </p>
+                                    <!-- Custom logout url to redirect to authentication provider -->
+                                    {{ Form::label('login_remote_user_custom_logout_url',  trans('admin/settings/general.login_remote_user_custom_logout_url_text')) }}
+                                    {{ Form::text('login_remote_user_custom_logout_url', Input::old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url),array('class' => 'form-control')) }}
+
+                                    {!! $errors->first('login_remote_user_custom_logout_url', '<span class="alert-msg">:message</span>') !!}
+                                    <p class="help-block">
+                                        {{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }}
+                                    </p>
+                                    <!--  Disable other logins mechanism -->
+                                    {{ Form::checkbox('login_common_disabled', '1', Input::old('login_common_disabled', $setting->login_common_disabled),array('class' => 'minimal')) }}
+                                    {{ Form::label('login_common_disabled',  trans('admin/settings/general.login_common_disabled_text')) }}
+                                    {!! $errors->first('login_common_disabled', '<span class="alert-msg">:message</span>') !!}
+                                    <p class="help-block">
+                                        {{ trans('admin/settings/general.login_common_disabled_help') }}
+                                    </p>
+                                @endif
+
                             </div>
                         </div>
 
diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php
index 45ed4bd80e..bc71460b4b 100644
--- a/resources/views/vendor/mail/html/header.blade.php
+++ b/resources/views/vendor/mail/html/header.blade.php
@@ -1,5 +1,5 @@
 <tr>
-    <td class="header">
+    <td class="header"{!!  ($snipeSettings->header_color!='') ? ' style="background-color: '.e($snipeSettings->header_color).'"' : '' !!}>
         @if (($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted()))
 
             @if ($snipeSettings->brand == '3')