diff --git a/docs/upgrades/upgrade_6.8.7-6.99.0.pl b/docs/upgrades/upgrade_6.8.7-6.99.0.pl
index 0c916093a..24ba3749f 100644
--- a/docs/upgrades/upgrade_6.8.7-6.99.0.pl
+++ b/docs/upgrades/upgrade_6.8.7-6.99.0.pl
@@ -402,10 +402,18 @@ EOT1
 
 ## Event Template ##
 my $template2 = <<EOT2;
-
 <h1><tmpl_var title></h1><br>
 <tmpl_var description>&nbsp;<tmpl_var price><br>
+
+<tmpl_unless eventIsFull>
 <a href="<tmpl_var purchase.url>"><tmpl_var purchase.label></a>
+<tmpl_else>
+<tmpl_var purchase.label><br />
+</tmpl_unless>
+max attendees:<tmpl_var maximumAttendees><br />
+seats remaining:<tmpl_var seatsRemaining><br />
+number registered:<tmpl_var numberRegistered><br />
+event full?:<tmpl_var eventIsFull<br />
 EOT2
 
 ## Checkout Template ##
@@ -449,7 +457,6 @@ my $template3 = <<EOT3;
 <tr><td><tmpl_var form.city.label></td><td><tmpl_var form.city></td></tr>
 <tr><td><tmpl_var form.state.label></td><td><tmpl_var form.state></td></tr>
 <tr><td><tmpl_var form.zipcode.label></td><td><tmpl_var form.zipcode></td></tr>
-<tr><td><tmpl_var form.firstName.label></td><td><tmpl_var form.firstName></td></tr>
 <tr><td><tmpl_var form.country.label></td><td><tmpl_var form.country></td></tr>
 <tr><td><tmpl_var form.phoneNumber.label></td><td><tmpl_var form.phoneNumber></td></tr>
 <tr><td><tmpl_var form.email.label></td><td><tmpl_var form.email></td></tr>
diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
index 31c0e18f5..6b6d66f2e 100644
--- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
+++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
@@ -1211,7 +1211,7 @@ sub view {
 	
 	my $i18n = WebGUI::International->new($self->session,'Asset_EventManagementSystem');
 	# Get the products available for sale for this page
-	my $sql = "select p.productId, p.title, p.description, p.price, p.templateId, e.approved 
+	my $sql = "select p.productId, p.title, p.description, p.price, p.templateId, e.approved, e.maximumAttendees 
 		   from products as p, EventManagementSystem_products as e
 		   where
 		   	p.productId = e.productId and approved=1
@@ -1232,9 +1232,20 @@ sub view {
 	  $eventFields{'title'} = $event->{'title'};
 	  $eventFields{'description'} = $event->{'description'};
 	  $eventFields{'price'} = $event->{'price'};
-	  $eventFields{'purchase.url'} = $self->getUrl('func=addToCart;pid='.$event->{'productId'});
-	  $eventFields{'purchase.label'} = $i18n->get('add to cart');
-	  
+	  my ($numberRegistered) = $self->session->db->quickArray("select count(*) from EventManagementSystem_registrations as r, EventManagementSystem_purchases as p
+	  	where r.purchaseId = p.purchaseId and r.productId=".$self->session->db->quote($event->{'productId'}));
+	  $eventFields{'numberRegistered'} = $numberRegistered;
+	  $eventFields{'maximumAttendees'} = $event->{'maximumAttendees'};
+	  $eventFields{'seatsRemaining'} = $event->{'maximumAttendees'} - $numberRegistered;
+	  $eventFields{'eventIsFull'} = ($eventFields{'seatsRemaining'} == 0);
+
+	  if ($eventFields{'eventIsFull'}) {
+	  	$eventFields{'purchase.label'} = "Sold Out";;
+	  }
+	  else {
+	  	$eventFields{'purchase.url'} = $self->getUrl('func=addToCart;pid='.$event->{'productId'});
+	  	$eventFields{'purchase.label'} = $i18n->get('add to cart');
+	  }
 	  push (@events, {'event' => $self->processTemplate(\%eventFields, $event->{'templateId'}) });	  
 	} 
 	$var{'checkout.url'} = $self->getUrl('op=viewCart');