diff --git a/filemin/chown.cgi b/filemin/chown.cgi
index f7730a694..b08a82b86 100755
--- a/filemin/chown.cgi
+++ b/filemin/chown.cgi
@@ -6,37 +6,44 @@ require './filemin-lib.pl';
 
 get_paths();
 
-if(!$in{'owner'} or !$in{'group'}) {
-    &redirect("index.cgi?path=".&urlize($path));
-}
+if (!$in{'owner'} || !$in{'group'}) {
+	&redirect("index.cgi?path=".&urlize($path));
+	}
 
 (my $login, my $pass, my $uid, my $gid) = getpwnam($in{'owner'});
 my $grid = getgrnam($in{'group'});
 my $recursive;
-if($in{'recursive'} eq 'true') { $recursive = '-R'; } else { $recursive = ''; }
+if ($in{'recursive'} eq 'true') {
+	$recursive = '-R';
+	}
+else {
+	$recursive = '';
+	}
 
 my @errors;
 
-if(! defined $login) {
-    push @errors, "<b>$in{'owner'}</b> $text{'error_user_not_found'}";
-}
+if (!defined($login)) {
+	push @errors, "<b>".&html_escape($in{'owner'})."</b> $text{'error_user_not_found'}";
+	}
 
-if(! defined $grid) {
-    push @errors, "<b>$in{'group'}</b> $text{'error_group_not_found'}";
-}
+if (!defined($grid)) {
+	push @errors, "<b>".&html_escape($in{'group'})."</b> $text{'error_group_not_found'}";
+	}
 
 if (scalar(@errors) > 0) {
-        print_errors(@errors);
-} else {
-    foreach $name (split(/\0/, $in{'name'})) {
-#        if(!chown $uid, $grid, $cwd.'/'.$name) {
-        if(system_logged("chown $recursive $uid:$grid ".quotemeta("$cwd/$name")) != 0) {
-            push @errors, "$name - $text{'error_chown'}: $?";
-        }
-    }
-    if (scalar(@errors) > 0) {
-        print_errors(@errors);
-    } else {
-        &redirect("index.cgi?path=".&urlize($path));
-    }
-}
+	print_errors(@errors);
+	}
+else {
+	foreach $name (split(/\0/, $in{'name'})) {
+		if (system_logged("chown $recursive $uid:$grid ".
+				  quotemeta("$cwd/$name")) != 0) {
+			push @errors, "$name - $text{'error_chown'}: $?";
+			}
+		}
+	if (scalar(@errors) > 0) {
+		print_errors(@errors);
+		}
+	else {
+		&redirect("index.cgi?path=".&urlize($path));
+		}
+	}