diff --git a/reservation.inc b/reservation.inc
index 77fb8b0..325d0df 100644
--- a/reservation.inc
+++ b/reservation.inc
@@ -18,7 +18,7 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
   // Retrieve an array which contains the path pieces.
   $current_path = \Drupal::service('path.current')->getPath();
   $path_args = explode('/', $current_path);
-
+  
   // for case of std reservation add form - this should likely be blocked; but leave for development
   if (count($path_args) <= 3) return;
 
@@ -62,7 +62,34 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
     $yyyymmdd = date('Y-m-d', strtotime($year . '-' . $month . '-' . $day));
     $d = $yyyymmdd . ' 00:00:00';
   }
-
+  if(reserve_daily_max_exceeded($yyyymmdd)) {
+    $form = array();
+    $form['message'] = [
+        '#type' => 'markup',
+        '#weight' => -25,
+        '#markup' => '
+      <div class="messages__wrapper layout-container">
+      <div role="contentinfo" aria-label="Warning message" class="messages messages--warning">' .
+          'You have exceeded the max number of daily bookings.  Unable to add reservation'.
+          '</div></div>',
+      ];
+    return;
+  }
+  $config = \Drupal::config('reserve.settings');
+  $max_per_user = $config->get('reservations_per_user');
+  if(count(reserve_user_reservations()) > $max_per_user){
+    $form = array();
+    $form['message'] = [
+        '#type' => 'markup',
+        '#weight' => -25,
+        '#markup' => '
+      <div class="messages__wrapper layout-container">
+      <div role="contentinfo" aria-label="Warning message" class="messages messages--warning">' .
+          'You have exceeded your max number of open bookings.  Unable to add reservation'.
+          '</div></div>',
+      ];
+    return;
+  }
   $entity = \Drupal::entityTypeManager()->getStorage($entity_type)->load($eid);
   $bundle = $entity->bundle();
   $date = date('l, M d, Y', strtotime($d));
diff --git a/reserve.inc b/reserve.inc
index 9224708..9077517 100644
--- a/reserve.inc
+++ b/reserve.inc
@@ -923,24 +923,22 @@ function reserve_valid_lengths($rid, $ebundle, $yyyy_mmdd, $time, $id = NULL, $a
  *   FALSE - the maximum has not been exceeded.
  */
 function reserve_daily_max_exceeded($yyyy_mmdd) {
-  global $user;
+  $user = \Drupal::currentUser(); 
   $config = \Drupal::config('reserve.settings');
-
   $max = $config->get('reservations_per_day');
   if (!$max) {
     return FALSE;
   }
-
   $record_count = 0;
-  if ($user->uid) {
-    $ids = \Drupal::service('entity_type.manager')
+  if ($user->id()) {
+   $ids = \Drupal::service('entity_type.manager')
       ->getStorage('reserve_reservation')->getQuery()
-      ->condition('user_id', $user->id)
-      ->condition('reservation_date', 'value', $yyyy_mmdd . '%', 'like')
+      ->condition('user_id', $user->id())
+      ->condition('reservation_date', $yyyy_mmdd . '%', 'like')
       ->execute();
     $record_count = count($ids);
   }
-
+  debug($record_count, 'pp-record-count', TRUE);
   if ($record_count < $max) {
     return FALSE;
   }