Index: Mk/Scripts/do-users-groups.sh
===================================================================
--- Mk/Scripts/do-users-groups.sh
+++ Mk/Scripts/do-users-groups.sh
@@ -71,8 +71,10 @@
 			  echo "Using existing group '$group'."
 			fi
 			eot2
+		# As we changed IFS around the while read, we must unset it
+		# here to let sh parse arguments in the next command line.
 		done <<-eot
-		$(grep -h "^${group}:" ${dp_GID_FILES} | head -n 1)
+		$(unset IFS; grep -h "^${group}:" ${dp_GID_FILES} | head -n 1)
 		eot
 		IFS=${o_IFS}
 	done
@@ -121,8 +123,10 @@
 					echo "${dp_INSTALL} -d -g $group -o $login $homedir" >> "${dp_UG_INSTALL}"
 					;;
 			esac
+		# As we changed IFS around the while read, we must unset it
+		# here to let sh parse arguments in the next command line.
 		done <<-eot
-		$(grep -h "^${user}:" ${dp_UID_FILES} | head -n 1)
+		$(unset IFS; grep -h "^${user}:" ${dp_UID_FILES} | head -n 1)
 		eot
 		IFS=${o_IFS}
 	done
@@ -150,8 +154,10 @@
 				done
 			done
 			IFS=${oo_IFS}
+		# As we changed IFS around the while read, we must unset it
+		# here to let sh parse arguments in the next command line.
 		done <<-eot
-		$(grep -h "^${group}:" ${dp_GID_FILES} | head -n 1)
+		$(unset IFS; grep -h "^${group}:" ${dp_GID_FILES} | head -n 1)
 		eot
 		IFS=${o_IFS}
 	done