diff --git a/app/Models/User.php b/app/Models/User.php
index f739ef8b0f..e535fa0fde 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -337,7 +337,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      */
     public function licenses()
     {
-        return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'assigned_to', 'license_id')->withPivot('id');
+        return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'assigned_to', 'license_id')->withPivot('id', 'created_at', 'updated_at');
     }
 
     /**
diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index c5c7824edc..72d4a404d4 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -37,7 +37,13 @@ Form::macro('countries', function ($name = 'country', $selected = null, $class =
 
     // Pull the autoglossonym array from the localizations translation file
     foreach (trans('localizations.countries') as $abbr => $country) {
-        $select .= '<option value="'.strtoupper($abbr).'"'.(strtoupper($selected) == strtoupper($abbr) ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$country.'</option> ';
+
+        // We have to handle it this way to handle deprecication warnings since you can't strtoupper on null
+        if ($abbr!='') {
+            $abbr = strtoupper($abbr);
+        }
+
+        $select .= '<option value="'.$abbr.'"'.($selected == $abbr) ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"'.'>'.$country.'</option> ';
     }
 
     $select .= '</select>';
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 3be7923d88..cd82289863 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -151,7 +151,7 @@
                             <i class="fa-lock" aria-hidden="true"></i> {{ str_repeat('x', 15) }}
                         @endcan
                     </td>
-                    <td>{{  $license->pivot->created_at }}</td>
+                    <td>{{  $license->pivot->updated_at }}</td>
                 </tr>
                 @php
                     $lcounter++