diff --git a/htdocs/add_oclass_form.php b/htdocs/add_oclass_form.php
index 9330ce1..ce1fa22 100644
--- a/htdocs/add_oclass_form.php
+++ b/htdocs/add_oclass_form.php
@@ -107,6 +107,9 @@ if (count($ldap['attrs']['need']) > 0) {
 		$href = sprintf('cmd.php?cmd=template_engine&server_id=%s&dn=%s&modified_attrs[]=objectclass',
 			$app['server']->getIndex(),rawurlencode($request['dn']));
 
+		if (get_request('meth','REQUEST') == 'ajax')
+			$href .= '&meth=ajax';
+
 		header(sprintf('Location: %s',$href));
 		die();
 	}
diff --git a/htdocs/add_value_form.php b/htdocs/add_value_form.php
index 2100f6a..f4c070e 100644
--- a/htdocs/add_value_form.php
+++ b/htdocs/add_value_form.php
@@ -32,7 +32,7 @@ if ($request['attribute']->isReadOnly())
 */
 
 # Render the form
-if (get_request('meth','REQUEST') != 'ajax') {
+if (! strcasecmp($request['attr'],'objectclass') || get_request('meth','REQUEST') != 'ajax') {
 	# Render the form.
 	$request['page']->drawTitle(sprintf('%s <b>%s</b> %s <b>%s</b>',_('Add new'),$request['attr'],_('value to'),get_rdn($request['dn'])));
 	$request['page']->drawSubTitle();
@@ -113,7 +113,9 @@ if (get_request('meth','REQUEST') != 'ajax') {
 		echo '</td></tr><tr><td>';
 
 		echo '<br />';
-		printf('<input id="save_button" type="submit" value="%s" />',_('Add new ObjectClass'));
+		printf('<input id="save_button" type="submit" value="%s" %s />',
+			_('Add new ObjectClass'),
+			(isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'entry_form\'),\'%s\');"',_('Updating Object')) : ''));
 		echo '</td></tr></table>';
 		echo '</td>';
 		echo '</tr>';
diff --git a/htdocs/create_confirm.php b/htdocs/create_confirm.php
index cfff1f9..7f23f75 100644
--- a/htdocs/create_confirm.php
+++ b/htdocs/create_confirm.php
@@ -60,7 +60,7 @@ if (count($request['template']->getLDAPadd(true))) {
 	echo '</div>';
 
 	echo "\n\n";
-	echo '<form action="cmd.php" method="post">';
+	echo '<form action="cmd.php" method="post" id="create_form">';
 	echo '<div>';
 	echo '<input type="hidden" name="cmd" value="create" />';
 	printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex());
@@ -111,19 +111,32 @@ if (count($request['template']->getLDAPadd(true))) {
 
 	echo '<div style="text-align: center;">';
 	echo '<br />';
-	printf('<input type="submit" value="%s" />',_('Commit'));
-	printf('<input type="submit" name="cancel" value="%s" />',_('Cancel'));
+
+	printf('<input type="submit" value="%s" %s/>',
+		_('Commit'),
+		(isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'create_form\'),\'%s\');"',_('Updating Object')) : ''));
+
+	printf('<input type="submit" name="cancel" value="%s" %s/>',
+		_('Cancel'),
+		(isAjaxEnabled() ? sprintf('onclick="return ajDISPLAY(\'BODY\',\'cmd=template_engine&server_id=%s&container=%s\',\'%s\');"',$app['server']->getIndex(),$request['template']->getContainer(),_('Retrieving DN')) : ''));
+
 	echo '</div>';
 	echo '</form>';
 	echo '<br />';
 
 } else {
-	echo '<div style="text-align: center;">';
-	echo _('You made no changes');
-	$href = sprintf('cmd.php?cmd=template_engine&server_id=%s&dn=%s',
+	$href = sprintf('cmd=template_engine&server_id=%s&dn=%s',
 		$app['server']->getIndex(),rawurlencode($request['dn']));
 
-	printf(' <a href="%s">%s</a>.',htmlspecialchars($href),_('Go back'));
+	echo '<div style="text-align: center;">';
+	echo _('You made no changes');
+
+	if (isAjaxEnabled())
+		printf(' <a href="cmd.php?%s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');">%s</a>.',
+			htmlspecialchars($href),htmlspecialchars($href),_('Retrieving DN'),_('Go back'));
+	else
+		printf(' <a href="cmd.php?%s">%s</a>.',htmlspecialchars($href),_('Go back'));
+
 	echo '</div>';
 }
 ?>
diff --git a/htdocs/delete_form.php b/htdocs/delete_form.php
index ecffa9b..5056d88 100644
--- a/htdocs/delete_form.php
+++ b/htdocs/delete_form.php
@@ -67,11 +67,14 @@ if (count($request['children'])) {
 
 	echo '<tr>';
 	echo '<td style="width: 50%; text-align: center;">';
-	echo '<form action="cmd.php" method="post">';
+	echo '<form action="cmd.php" method="post" id="delete_form">';
 	echo '<input type="hidden" name="cmd" value="rdelete" />';
 	printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex());
 	printf('<input type="hidden" name="dn" value="%s" />',htmlspecialchars($request['dn']));
-	printf('<input type="submit" value="%s" />',sprintf(_('Delete all %s objects'),count($request['search'])));
+	//@todo need to refresh the tree after a delete
+	printf('<input type="submit" value="%s" %s />',
+		sprintf(_('Delete all %s objects'),count($request['search'])),
+		(isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'delete_form\'),\'%s\');"',_('Deleting Object(s)')) : ''));
 	echo '</form>';
 	echo '</td>';
 
@@ -80,7 +83,9 @@ if (count($request['children'])) {
 	echo '<input type="hidden" name="cmd" value="template_engine" />';
 	printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex());
 	printf('<input type="hidden" name="dn" value="%s" />',htmlspecialchars($request['dn']));
-	printf('<input type="submit" name="submit" value="%s" />',_('Cancel'));
+	printf('<input type="submit" name="submit" value="%s" %s />',
+		_('Cancel'),
+		(isAjaxEnabled() ? sprintf('onclick="return ajDISPLAY(\'BODY\',\'cmd=template_engine&server_id=%s&dn=%s\',\'%s\');"',$app['server']->getIndex(),htmlspecialchars($request['dn']),_('Retrieving DN')) : ''));
 	echo '</form>';
 	echo '</td>';
 	echo '</tr>';
@@ -114,11 +119,14 @@ if (count($request['children'])) {
 
 	echo '<tr>';
 	echo '<td colspan="2" style="width: 50%; text-align: center;">';
-	echo '<form action="cmd.php" method="post">';
+	echo '<form action="cmd.php" method="post" id="delete_form">';
 	echo '<input type="hidden" name="cmd" value="delete" />';
 	printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex());
 	printf('<input type="hidden" name="dn" value="%s" />',htmlspecialchars($request['dn']));
-	printf('<input type="submit" name="submit" value="%s" />',_('Delete'));
+	//@todo need to refresh the tree after a delete
+	printf('<input type="submit" name="submit" value="%s" %s />',
+		_('Delete'),
+		(isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'delete_form\'),\'%s\');"',_('Deleting Object(s)')) : ''));
 	echo '</form>';
 
 	echo '</td>';
@@ -128,7 +136,9 @@ if (count($request['children'])) {
 	echo '<input type="hidden" name="cmd" value="template_engine" />';
 	printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex());
 	printf('<input type="hidden" name="dn" value="%s" />',htmlspecialchars($request['dn']));
-	printf('<input type="submit" name="submit" value="%s" />',_('Cancel'));
+	printf('<input type="submit" name="submit" value="%s" %s />',
+		_('Cancel'),
+		(isAjaxEnabled() ? sprintf('onclick="return ajDISPLAY(\'BODY\',\'cmd=template_engine&server_id=%s&dn=%s\',\'%s\');"',$app['server']->getIndex(),htmlspecialchars($request['dn']),_('Retrieving DN')) : ''));
 	echo '</form>';
 
 	echo '</td>';
diff --git a/htdocs/js/ajax_functions.js b/htdocs/js/ajax_functions.js
index ab88a8b..680d157 100644
--- a/htdocs/js/ajax_functions.js
+++ b/htdocs/js/ajax_functions.js
@@ -10,9 +10,27 @@ var http_request = null;
 var http_request_success_callback = '';
 var http_request_error_callback = '';
 
-function ajDISPLAY(div,urlParameters,display) {
+function ajSUBMIT(div,obj,display) {
 	var pageDiv = getDiv(div);
 
+	window.scrollTo(0,95);
+
+	if (pageDiv)
+		includeHTML(pageDiv,'<img src="images/ajax-progress.gif"><br><small>'+display+'...</small>');
+	else
+		return true;
+
+	makeHttpRequest('cmd.php',getParameters(obj.parentNode)+'meth=ajax','POST','alertAJ','cancelAJ',div);
+
+	return false;
+}
+
+function ajDISPLAY(div,urlParameters,display,ns) {
+	var pageDiv = getDiv(div);
+
+	if (! ns)
+		window.scrollTo(0,95);
+
 	if (pageDiv)
 		includeHTML(pageDiv,'<img src="images/ajax-progress.gif"><br><small>'+display+'...</small>');
 	else
@@ -190,3 +208,46 @@ function makeHttpRequest(url,parameters,meth,successCallbackFunctionName,errorCa
 	if (meth == 'GET') parameters = null;
 	http_request.send(parameters);
 }
+
+function getParameters(obj) {
+	var elements = ['input','select','textarea'];
+	var getstr = '';
+
+	for (var j in elements) {
+		for (i=0; i<obj.getElementsByTagName(elements[j]).length; i++) {
+			// Ignore submit variables
+			if (obj.getElementsByTagName(elements[j])[i].type == 'submit') {
+
+			} else if (obj.getElementsByTagName(elements[j])[i].type == 'text') {
+				getstr += obj.getElementsByTagName(elements[j])[i].name + '=' + encodeURIComponent(obj.getElementsByTagName(elements[j])[i].value) + '&';
+
+			} else if (obj.getElementsByTagName(elements[j])[i].type == 'checkbox') {
+				if (obj.getElementsByTagName(elements[j])[i].checked) {
+					getstr += obj.getElementsByTagName(elements[j])[i].name + '=' + encodeURIComponent(obj.getElementsByTagName(elements[j])[i].value) + '&';
+				} else {
+					getstr += obj.getElementsByTagName(elements[j])[i].name + '=&';
+				}
+
+			} else if (obj.getElementsByTagName(elements[j])[i].type == 'radio') {
+				if (obj.getElementsByTagName(elements[j])[i].checked) {
+					getstr += obj.getElementsByTagName(elements[j])[i].name + '=' + encodeURIComponent(obj.getElementsByTagName(elements[j])[i].value) + '&';
+				}
+
+			} else if (obj.getElementsByTagName(elements[j])[i].tagName == 'SELECT') {
+				var sel = obj.getElementsByTagName(elements[j])[i];
+				getstr += sel.name + '=' + encodeURIComponent(sel.options[sel.selectedIndex].value) + '&';
+
+			} else if (obj.getElementsByTagName(elements[j])[i].tagName == 'INPUT') {
+				getstr += obj.getElementsByTagName(elements[j])[i].name + '=' + encodeURIComponent(obj.getElementsByTagName(elements[j])[i].value) + '&';
+
+			} else if (obj.getElementsByTagName(elements[j])[i].tagName == 'TEXTAREA') {
+				getstr += obj.getElementsByTagName(elements[j])[i].name + '=' + encodeURIComponent(obj.getElementsByTagName(elements[j])[i].value) + '&';
+
+			} else {
+				alert('UNTRAPPED FORM tag:'+elements[j]+', n: '+obj.getElementsByTagName(elements[j])[i].tagName+', t:'+obj.getElementsByTagName(elements[j])[i].type);
+			}
+		}
+	}
+
+	return getstr;
+}
diff --git a/htdocs/update.php b/htdocs/update.php
index 3224046..f2e1833 100644
--- a/htdocs/update.php
+++ b/htdocs/update.php
@@ -69,6 +69,9 @@ if ($result) {
 	foreach ($request['template']->getLDAPmodify() as $attr => $junk)
 		$redirect_url .= sprintf('&modified_attrs[]=%s',$attr);
 
+	if (get_request('meth','REQUEST') == 'ajax')
+		$redirect_url .= '&meth=ajax';
+
 	header("Location: $redirect_url");
 	die();
 }
diff --git a/htdocs/update_confirm.php b/htdocs/update_confirm.php
index 8358cc1..6c956a8 100644
--- a/htdocs/update_confirm.php
+++ b/htdocs/update_confirm.php
@@ -38,7 +38,7 @@ if (count($request['template']->getLDAPmodify(true))) {
 	echo '</div>';
 
 	echo "\n\n";
-	echo '<form action="cmd.php" method="post">';
+	echo '<form action="cmd.php" method="post" id="update_form">';
 	echo '<div>';
 	echo '<input type="hidden" name="cmd" value="update" />';
 	printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex());
@@ -187,14 +187,20 @@ if (count($request['template']->getLDAPmodify(true))) {
 
 	echo '<div style="text-align: center;">';
 	echo '<br />';
-	printf('<input type="submit" value="%s" />',_('Commit'));
-	printf('<input type="submit" name="cancel" value="%s" />',_('Cancel'));
+	printf('<input type="submit" value="%s" %s/>',
+		_('Commit'),
+		(isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'update_form\'),\'%s\');"',_('Updating Object')) : ''));
+
+	printf('<input type="submit" name="cancel" value="%s" %s/>',
+		_('Cancel'),
+		(isAjaxEnabled() ? sprintf('onclick="return ajDISPLAY(\'BODY\',\'cmd=template_engine&dn=%s\',\'%s\');"',htmlspecialchars($request['dn']),_('Retrieving DN')) : ''));
+
 	echo '</div>';
 	echo '</form>';
 	echo '<br />';
 
 	if (count($request['template']->getForceDeleteAttrs()) > 0) {
-		echo '<table class="result_table"><tr>';
+		echo '<table class="result_table" style="margin-left: auto; margin-right: auto;"><tr>';
 		printf('<td class="heading">%s:</td>',_('The deletion of objectClass(es)'));
 		printf('<td class="value"><b>%s</b></td>',implode('</b>, <b>',$request['template']->getAttribute('objectclass')->getRemovedValues()));
 		echo '</tr><tr>';
@@ -212,12 +218,18 @@ if (count($request['template']->getLDAPmodify(true))) {
 	}
 
 } else {
-	echo '<div style="text-align: center;">';
-	echo _('You made no changes');
-	$href = sprintf('cmd.php?cmd=template_engine&server_id=%s&dn=%s',
+	$href = sprintf('cmd=template_engine&server_id=%s&dn=%s',
 		 $app['server']->getIndex(),rawurlencode($request['dn']));
 
-	printf(' <a href="%s">%s</a>.',htmlspecialchars($href),_('Go back'));
+	echo '<div style="text-align: center;">';
+	echo _('You made no changes');
+
+	if (isAjaxEnabled())
+		printf(' <a href="cmd.php?%s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');">%s</a>.',
+			htmlspecialchars($href),htmlspecialchars($href),_('Retrieving DN'),_('Go back'));
+	else
+		printf(' <a href="cmd.php?%s">%s</a>.',htmlspecialchars($href),_('Go back'));
+
 	echo '</div>';
 }
 
diff --git a/lib/Template.php b/lib/Template.php
index a2835a7..8b5ed4d 100644
--- a/lib/Template.php
+++ b/lib/Template.php
@@ -343,7 +343,7 @@ class Template extends xmlTemplate {
 						continue;
 
 					# If _REQUEST['skip_array'] with this attr set, we'll ignore this new_value
-					if (isset($_REQUEST['skip_array'][$attr]))
+					if (isset($_REQUEST['skip_array'][$attr]) && $_REQUEST['skip_array'][$attr] == 'on')
 						continue;
 
 					# Prune out entries with a blank value.
diff --git a/lib/TemplateRender.php b/lib/TemplateRender.php
index e300037..ce2d625 100644
--- a/lib/TemplateRender.php
+++ b/lib/TemplateRender.php
@@ -1408,7 +1408,10 @@ class TemplateRender extends PageRender {
 		if (DEBUGTMP) printf('<font size=-2>%s</font><br />',__METHOD__);
 
 		if (! $this->template->isReadOnly())
-			printf('<tr><td colspan="2" style="text-align: center;"><input type="submit" id="create_button" name="submit" value="%s" /></td></tr>',_('Update Object'));
+			printf('<tr><td colspan="2" style="text-align: center;"><input type="submit" id="create_button" name="submit" value="%s" %s/></td></tr>',
+				_('Update Object'),
+				(isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'entry_form\'),\'%s\');"',_('Updating DN')) : ''),
+				_('Update Object'));
 	}
 
 	/** STEP FORM METHODS **/
@@ -1504,7 +1507,9 @@ class TemplateRender extends PageRender {
 		if ($page < $this->pagelast)
 			printf('<td>&nbsp;</td><td><input type="submit" id="create_button" value="%s" /></td>',_('Proceed &gt;&gt;'));
 		else
-			printf('<td style="text-align: center;"><input type="submit" id="create_button" name="submit" value="%s" /></td>',_('Create Object'));
+			printf('<td style="text-align: center;"><input type="submit" id="create_button" name="submit" value="%s" %s /></td>',
+				_('Create Object'),
+				(isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'entry_form\'),\'%s\');"',_('Creating Object')) : ''));
 		echo '</tr>';
 	}
 
@@ -2012,7 +2017,7 @@ function fillRec(id,value) {
 			$this->getServerID(),rawurlencode($this->template->getDN()),rawurlencode($attribute->getName(false))));
 
 		if (isAjaxEnabled())
-			return sprintf('(<a href="cmd.php?%s" title="%s %s" onclick="return ajDISPLAY(\'ADDVALUE%s\',\'%s&amp;raw=1\',\'%s\');">%s</a>)',
+			return sprintf('(<a href="cmd.php?%s" title="%s %s" onclick="return ajDISPLAY(\'ADDVALUE%s\',\'%s&amp;raw=1\',\'%s\',1);">%s</a>)',
 				$href_parm,_('Add an additional value to attribute'),$attribute->getName(false),$attribute->getName(),
 				$href_parm,_('Add Value to Attribute'),_('add value'));
 		else
@@ -2020,6 +2025,24 @@ function fillRec(id,value) {
 				$href_parm,_('Add an additional value to attribute'),$attribute->getName(false),_('add value'));
 	}
 
+	protected function getAddValueMenuItemObjectClassAttribute($attribute) {
+		if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
+			debug_log('Entered (%%)',129,0,__FILE__,__LINE__,__METHOD__,$fargs);
+
+		if (DEBUGTMP) printf('<font size=-2>%s</font><br />',__METHOD__);
+
+		$href_parm = htmlspecialchars(sprintf('cmd=add_value_form&server_id=%s&dn=%s&attr=%s',
+			$this->getServerID(),rawurlencode($this->template->getDN()),rawurlencode($attribute->getName(false))));
+
+		if (isAjaxEnabled())
+			return sprintf('(<a href="cmd.php?%s" title="%s %s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');">%s</a>)',
+				$href_parm,_('Add an additional value to attribute'),$attribute->getName(false),
+				$href_parm,_('Add Value to Attribute'),_('add value'));
+		else
+			return sprintf('(<a href="cmd.php?%s" title="%s %s">%s</a>)',
+				$href_parm,_('Add an additional value to attribute'),$attribute->getName(false),_('add value'));
+	}
+
 	protected function getModifyMemberMenuItemAttribute($attribute) {
 		if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
 			debug_log('Entered (%%)',129,0,__FILE__,__LINE__,__METHOD__,$fargs);
diff --git a/lib/page.php b/lib/page.php
index aedccc7..803eabe 100644
--- a/lib/page.php
+++ b/lib/page.php
@@ -107,8 +107,11 @@ class page {
 		printf('<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />');
 
 		if (isset($_SESSION[APPCONFIG]))
-			printf('<title>%s (%s) - %s</title>',
-				$this->_app['title'],app_version(),$_SESSION[APPCONFIG]->getValue('appearance','page_title'));
+			printf('<title>%s (%s) - %s%s</title>',
+				$this->_app['title'],
+				app_version(),
+				(get_request('dn','REQUEST') ? htmlspecialchars(get_request('dn','REQUEST')).' ' : ''),
+				$_SESSION[APPCONFIG]->getValue('appearance','page_title'));
 		else
 			printf('<title>%s - %s</title>',$this->_app['title'],app_version());