diff --git a/htdocs/add_attr_form.php b/htdocs/add_attr_form.php
index a3a35f8..5a59d44 100644
--- a/htdocs/add_attr_form.php
+++ b/htdocs/add_attr_form.php
@@ -73,6 +73,7 @@ if (get_request('meth','REQUEST') != 'ajax') {
 
 				echo '<select name="single_item_attr">';
 
+				$attr_list = [];
 				foreach ($attr['avail'] as $attribute) {
 					# Is there a user-friendly translation available for this attribute?
 					if ($attribute->haveFriendlyName())
@@ -84,7 +85,14 @@ if (get_request('meth','REQUEST') != 'ajax') {
 						$attr_display = $attribute->getName(FALSE);
 					}
 
-					printf('<option value="%s">%s</option>',htmlspecialchars($attribute->getName()),$attr_display);
+					$attr_list[htmlspecialchars($attribute->getName())] = $attr_display;
+				}
+
+				ksort($attr_list);
+
+				foreach($attr_list as $name => $value)
+				{
+					printf('<option value="%s">%s</option>', $name, $value);
 				}
 
 				echo '</select>';
@@ -201,9 +209,17 @@ if (get_request('meth','REQUEST') != 'ajax') {
 		'ADDATTR',$app['server']->getIndex(),$request['template']->getDNEncode(),_('Please Wait'));
 
 	printf('<option value="%s">%s</option>','','');
+	$attr_list = [];
 	foreach ($request['template']->getAvailAttrs() as $attribute)
 	{
-		printf('<option value="%s">%s</option>', htmlspecialchars($attribute->getName()), $attribute->getFriendlyName());
+		$attr_list[htmlspecialchars($attribute->getName())] = $attribute->getFriendlyName();
+	}
+
+	asort($attr_list);
+
+	foreach($attr_list as $name => $label)
+	{
+		printf('<option value="%s">%s</option>', $name, $label);
 	}
 
 	echo '</select>';
diff --git a/htdocs/update_confirm.php b/htdocs/update_confirm.php
index 6ab5c66..44c5b0e 100644
--- a/htdocs/update_confirm.php
+++ b/htdocs/update_confirm.php
@@ -72,7 +72,7 @@ if (count($request['template']->getLDAPmodify(true))) {
 
 		if (! $attribute->getOldValues())
 		{
-			printf('<span style='color: green'>[%s]</span>',_('attribute doesnt exist')); }
+			printf('<span style="color: green">[%s]</span>',_('attribute doesnt exist')); }
 
 		$dv = $attribute->getRemovedValues();
 		foreach ($attribute->getOldValues() as $key => $value) {