diff --git a/ChangeLog b/ChangeLog
index 7e7b25fe..f51b9c82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
 	* src/vipw.c: Use Prog instead of progname. This is needed since
 	Prog is used in the library.
 	* configure.in: Fix typo. libcrack default is 'no'.
+	* src/groupmod.c: Avoid implicit conversion of pointer to boolean.
+	* src/groupmod.c: osgrp can be set only if pflg || nflg. No need
+	to check for pflg || nflg again
 
 2011-07-08  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/src/groupmod.c b/src/groupmod.c
index 7d0d3fbc..65d50bec 100644
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -190,7 +190,7 @@ static void grp_update (void)
 	 * Get the current settings for this group.
 	 */
 	ogrp = gr_locate (group_name);
-	if (!ogrp) {
+	if (NULL == ogrp) {
 		fprintf (stderr,
 		         _("%s: group '%s' does not exist in %s\n"),
 		         Prog, group_name, gr_dbname ());
@@ -231,13 +231,12 @@ static void grp_update (void)
 		         Prog, grp.gr_name, gr_dbname ());
 		exit (E_GRP_UPDATE);
 	}
-#ifdef	SHADOWGRP
 
+#ifdef	SHADOWGRP
 	/*
 	 * Make sure there was a shadow entry to begin with.
 	 */
-	if (   (NULL != osgrp)
-	    && (pflg || nflg)) {
+	if (NULL != osgrp) {
 		/*
 		 * Write out the new shadow group entries as well.
 		 */