diff --git a/docs/upgrades/templates-6.99.4/data_list.tmpl b/docs/upgrades/templates-6.99.4/data_list.tmpl
index ee16ee998..50f32d8a4 100644
--- a/docs/upgrades/templates-6.99.4/data_list.tmpl
+++ b/docs/upgrades/templates-6.99.4/data_list.tmpl
@@ -6,11 +6,9 @@
 
 <tmpl_if canEdit>
 	<div class="dataControls">
-		<a href="<tmpl_var entryList.url>"><tmpl_var entryList.label></a>
 		&bull; <a href="<tmpl_var export.tab.url>"><tmpl_var export.tab.label></a>
-		<tmpl_if entryId>
-			&bull; <a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-			&bull; <a href="<tmpl_var deleteAllEntries.url>"><tmpl_var deleteAllEntries.label></a>
+		<tmpl_if hasEntries>
+			&bull; <a href="<tmpl_var deleteAllEntries.url>" onclick="<tmpl_var javascript.confirmation.deleteAll>"><tmpl_var deleteAllEntries.label></a>
 		</tmpl_if>
 		<tmpl_if session.var.adminOn>
 			&bull; <a href="<tmpl_var addField.url>"><tmpl_var addField.label></a>
@@ -41,6 +39,7 @@
 </tr>
 </tmpl_loop record_loop>
 </table>
+
 ~~~
 <style type="text/css">
 h2{
diff --git a/docs/upgrades/templates-6.99.4/default_dataform.tmpl b/docs/upgrades/templates-6.99.4/default_dataform.tmpl
index a7a48a19f..f94fb2cd9 100644
--- a/docs/upgrades/templates-6.99.4/default_dataform.tmpl
+++ b/docs/upgrades/templates-6.99.4/default_dataform.tmpl
@@ -27,8 +27,10 @@
 		<a href="<tmpl_var entryList.url>"><tmpl_var entryList.label></a>
 		&bull; <a href="<tmpl_var export.tab.url>"><tmpl_var export.tab.label></a>
 		<tmpl_if entryId>
-			&bull; <a href="<tmpl_var delete.url>"><tmpl_var delete.label></a>
-			&bull; <a href="<tmpl_var deleteAllEntries.url>"><tmpl_var deleteAllEntries.label></a>
+			&bull; <a href="<tmpl_var delete.url>" onclick="<tmpl_var javascript.confirmation.deleteOne>"><tmpl_var delete.label></a>
+		</tmpl_if>
+		<tmpl_if hasEntries>
+			&bull; <a href="<tmpl_var deleteAllEntries.url>" onclick="<tmpl_var javascript.confirmation.deleteAll>"><tmpl_var deleteAllEntries.label></a>
 		</tmpl_if>
 		<tmpl_if session.var.adminOn>
 			&bull; <a href="<tmpl_var addField.url>"><tmpl_var addField.label></a>
@@ -68,6 +70,7 @@
 <br />
 <tmpl_var form.save>
 <tmpl_var form.end>
+
 ~~~
 <style type="text/css">
 h2{
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index b2f662dd7..0e4de9a8e 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -296,6 +296,17 @@ sub getListTemplateVars {
 	my @fieldLoop;
 	$var->{"back.url"} = $self->getFormUrl;
 	$var->{"back.label"} = $i18n->get('go to form');
+	$var->{"deleteAllEntries.url"} = $self->getUrl("func=deleteAllEntriesConfirm");
+	$var->{"javascript.confirmation.deleteAll"} = sprintf("return confirm('%s');",$i18n->get('confirm delete all'));
+	$var->{"deleteAllEntries.label"} = $i18n->get(91);
+	$var->{"hasEntries"} = $self->hasEntries;
+	$var->{canEdit} = ($self->canEdit);
+	$var->{"export.tab.url"} = $self->getUrl('func=exportTab');
+	$var->{"export.tab.label"} = $i18n->get(84);
+	$var->{"addField.url"} = $self->getUrl('func=editField');
+	$var->{"addField.label"} = $i18n->get(76);
+	$var->{"addTab.label"}=  $i18n->get(105);;
+	$var->{"addTab.url"}= $self->getUrl('func=editTab');
 	my $fields = $self->session->db->read("select DataForm_fieldId,name,label,isMailField,type from DataForm_field
 			where assetId=".$self->session->db->quote($self->getId)." order by sequenceNumber");
 	while (my $field = $fields->hashRef) {
@@ -392,6 +403,11 @@ sub getRecordTemplateVars {
 	$var->{"back.label"} = $i18n->get(18);
 	$var->{"addField.url"} = $self->getUrl('func=editField');
 	$var->{"addField.label"} = $i18n->get(76);
+	$var->{"deleteAllEntries.url"} = $self->getUrl("func=deleteAllEntriesConfirm");
+	$var->{"deleteAllEntries.label"} = $i18n->get(91);
+	$var->{"javascript.confirmation.deleteAll"} = sprintf("return confirm('%s');",$i18n->get('confirm delete all'));
+	$var->{"javascript.confirmation.deleteOne"} = sprintf("return confirm('%s');",$i18n->get('confirm delete one'));
+	$var->{"hasEntries"} = $self->hasEntries;
 	# add Tab label, url, header and init
 	$var->{"addTab.label"}=  $i18n->get(105);;
 	$var->{"addTab.url"}= $self->getUrl('func=editTab');
@@ -511,6 +527,20 @@ sub getRecordTemplateVars {
 	return $var;
 }
 
+#-------------------------------------------------------------------
+
+=head2 hasEntries ( )
+
+Returns number of entries that exist for this dataform.
+
+=cut
+
+sub hasEntries {
+	my $self = shift;
+	my ($entryCount) = $self->session->db->quickArray("select count(*) from DataForm_entry where assetId=?",[$self->getId]);
+	
+	return $entryCount;
+}
 
 #-------------------------------------------------------------------
 
@@ -698,20 +728,11 @@ sub viewForm {
 	return $self->processTemplate($var,$self->get("templateId"));
 }
 
-#-------------------------------------------------------------------
-sub www_deleteAllEntries {
-	my $self = shift;
-	return $self->session->privilege->insufficient() unless $self->canEdit;
-        my $assetId = $self->session->form->process("entryId");
-	$self->deleteCollateral("DataForm_entry","assetId",$assetId);
-	$self->session->stow->set("mode","list");
-}
-
 #-------------------------------------------------------------------
 sub www_deleteAllEntriesConfirm {
 	my $self = shift;
-	return $self->session->privilege->insufficient() unless ($self->canEdit && $self->session->form->process("entryId")==$self->getId);
-	$self->session->db->write("delete from DataForm_entry where assetId=".$self->session->db->quote($self->getId));
+	return $self->session->privilege->insufficient() unless ($self->canEdit);
+	$self->session->db->write("delete from DataForm_entry where assetId=?",[$self->getId]);
 	return $self->www_view;
 }
 
@@ -723,6 +744,7 @@ sub www_deleteEntry {
         my $entryId = $self->session->form->process("entryId");
 	$self->deleteCollateral("DataForm_entry","DataForm_entryId",$entryId);
 	$self->session->stow->set("mode","list");
+	return $self->www_view;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/i18n/English/Asset_DataForm.pm b/lib/WebGUI/i18n/English/Asset_DataForm.pm
index 489add67b..cb4c8360c 100644
--- a/lib/WebGUI/i18n/English/Asset_DataForm.pm
+++ b/lib/WebGUI/i18n/English/Asset_DataForm.pm
@@ -25,7 +25,14 @@ our $I18N = {
 		message => q|Field Name|,
 		lastUpdated => 1031514049
 	},
-
+	'confirm delete all' => {
+		message => q|Are you sure you want to DELETE all of this Data Form\'s entries permanently?|,
+		lastUpdated => 1031514049
+	},
+	'confirm delete one' => {
+		message => q|Are you sure you want to DELETE this entry permanently?|,
+		lastUpdated => 1031514049
+	},
 	'71' => {
 		message => q|
 <p>This Asset creates a simple multipurpose data-entry and display