--- nagios-2.5/cgi/cmd.c	2006-05-19 15:25:03.000000000 +0100
+++ nagios-2.5.unacks/cgi/cmd.c	2006-10-27 16:57:17.000000000 +0100
@@ -942,9 +942,15 @@
 		printf("<tr><td CLASS='optBoxItem'>Persistent%s:</td><td><b>",(cmd==CMD_ACKNOWLEDGE_HOST_PROBLEM)?" Comment":"");
 		printf("<INPUT TYPE='checkbox' NAME='persistent' CHECKED>");
 		printf("</b></td></tr>\n");
-		printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
-		printf("<INPUT TYPE'TEXT' NAME='com_author' VALUE='%s'>",comment_author);
-		printf("</b></td></tr>\n");
+		if(use_authentication==FALSE) {
+			printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
+			printf("<INPUT TYPE='TEXT' NAME='com_author' VALUE='%s'>",comment_author);
+			printf("</b></td></tr>\n"); 
+			} 
+		else {
+			printf("<tr><td CLASS='optBoxItem'>Author:</td><td><b>%s</b></td></tr>\n",comment_author);
+			printf("<INPUT TYPE='hidden' NAME='com_author' VALUE='%s'>",comment_author);
+			}
 		printf("<tr><td CLASS='optBoxRequiredItem'>Comment:</td><td><b>");
 		printf("<INPUT TYPE='TEXT' NAME='com_data' VALUE='%s' SIZE=40>",comment_data);
 		printf("</b></td></tr>\n");
@@ -968,9 +974,15 @@
 		printf("<tr><td CLASS='optBoxItem'>Persistent%s:</td><td><b>",(cmd==CMD_ACKNOWLEDGE_SVC_PROBLEM)?" Comment":"");
 		printf("<INPUT TYPE='checkbox' NAME='persistent' CHECKED>");
 		printf("</b></td></tr>\n");
-		printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
-		printf("<INPUT TYPE='TEXT' NAME='com_author' VALUE='%s'>",comment_author);
-		printf("</b></td></tr>\n");
+		if(use_authentication==FALSE) {
+			printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
+			printf("<INPUT TYPE='TEXT' NAME='com_author' VALUE='%s'>",comment_author);
+			printf("</b></td></tr>\n");
+			}
+		else {
+			printf("<tr><td CLASS='optBoxItem'>Author:</td><td><b>%s</b></td></tr>\n",comment_author);
+			printf("<INPUT TYPE='hidden' NAME='com_author' VALUE='%s'>",comment_author);
+			}
 		printf("<tr><td CLASS='optBoxRequiredItem'>Comment:</td><td><b>");
 		printf("<INPUT TYPE='TEXT' NAME='com_data' VALUE='%s' SIZE=40>",comment_data);
 		printf("</b></td></tr>\n");
@@ -1151,9 +1163,15 @@
 			printf("<tr><td CLASS='optBoxRequiredItem'>Service:</td><td><b>");
 			printf("<INPUT TYPE='TEXT' NAME='service' VALUE='%s'>",service_desc);
 		        }
-		printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
-		printf("<INPUT TYPE='TEXT' NAME='com_author' VALUE='%s'>",comment_author);
-		printf("</b></td></tr>\n");
+		if(use_authentication==FALSE) {
+			printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
+			printf("<INPUT TYPE='TEXT' NAME='com_author' VALUE='%s'>",comment_author);
+			printf("</b></td></tr>\n");
+			}
+		else {
+			printf("<tr><td CLASS='optBoxItem'>Author:</td><td><b>%s</b></td></tr>\n",comment_author);
+			printf("<INPUT TYPE='hidden' NAME='com_author' VALUE='%s'>",comment_author);
+			}
 		printf("<tr><td CLASS='optBoxRequiredItem'>Comment:</td><td><b>");
 		printf("<INPUT TYPE='TEXT' NAME='com_data' VALUE='%s' SIZE=40>",comment_data);
 		printf("</b></td></tr>\n");
@@ -1283,9 +1301,15 @@
 			printf("<INPUT TYPE='TEXT' NAME='servicegroup' VALUE='%s'>",servicegroup_name);
 			printf("</b></td></tr>\n");
 		        }
-		printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
-		printf("<INPUT TYPE='TEXT' NAME='com_author' VALUE='%s'>",comment_author);
-		printf("</b></td></tr>\n");
+		if(use_authentication==FALSE) {
+			printf("<tr><td CLASS='optBoxRequiredItem'>Author (Your Name):</td><td><b>");
+			printf("<INPUT TYPE='TEXT' NAME='com_author' VALUE='%s'>",comment_author);
+			printf("</b></td></tr>\n");
+			}
+		else {
+			printf("<tr><td CLASS='optBoxItem'>Author:</td><td><b>%s</b></td></tr>\n",comment_author);
+			printf("<INPUT TYPE='hidden' NAME='com_author' VALUE='%s'>",comment_author);
+			}
 		printf("<tr><td CLASS='optBoxRequiredItem'>Comment:</td><td><b>");
 		printf("<INPUT TYPE='TEXT' NAME='com_data' VALUE='%s' SIZE=40>",comment_data);
 		printf("</b></td></tr>\n");