diff --git a/bin/om b/bin/om
index abbbe60d5..978a37ca0 100755
--- a/bin/om
+++ b/bin/om
@@ -108,7 +108,7 @@ main() {
 		exit
 	fi
 
-	if ! test -z "$OSVC_COMMAND_LOG"
+	if [ ! -z "$OSVC_COMMAND_LOG" ]
 	then
 		log "$@" >/dev/null 2>&1
 	fi
@@ -133,13 +133,17 @@ main() {
 
 log() {
 	OSVC_COMMAND_STRING="$0 $@"
-	if ! test -f $OSVC_COMMAND_LOG
+	if [ ! -f "$OSVC_COMMAND_LOG" ]
 	then
 		touch $OSVC_COMMAND_LOG
 	fi
 	if test -w $OSVC_COMMAND_LOG
 	then
-		GREP=`which grep 2>/dev/null`
+		if [ "`uname`" = "SunOS" ] ; then
+			GREP=`which ggrep 2>/dev/null`
+		else
+			GREP=`which grep 2>/dev/null`
+		fi
 		if test -x "$GREP"
 		then
 			echo "$OSVC_COMMAND_STRING" | $GREP -qE 'sec/|secret' && return