diff --git a/src/chfn.c b/src/chfn.c
index 6607cb09..3baea8f8 100644
--- a/src/chfn.c
+++ b/src/chfn.c
@@ -210,7 +210,8 @@ static char *copy_field (char *in, char *out, char *extra)
 	char *cp = NULL;
 
 	while (NULL != in) {
-		if ((cp = strchr (in, ',')) != NULL) {
+		cp = strchr (in, ',');
+		if (NULL != cp) {
 			*cp++ = '\0';
 		}