diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh
index 46c85be..c0eb219 100644
--- a/auth/sample/bin/client.sh
+++ b/auth/sample/bin/client.sh
@@ -119,7 +119,7 @@
 	    if [ "$ADD" = "Y" ]; then
 		echo $2 >> $F
 	    else 
-                sed -i.backup -e "s/\\(${1}.*=\\).*/\\1${2}/" $F
+               sed -i.backup -e "s/\\(${1}.*=\\).*/\\1\"${2}\"/" $F
 	    fi
             cat $F
         done
diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index 33dca67..8ce43fc 100644
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -92,7 +92,7 @@
 		echo "$1=$2" >> $F
 	    else 
 		VALUE=${2//\//\\\/}
-                sed -i.backup -e "s/\(${1}=\).*/\1${VALUE}/" $F
+                sed -i.backup -e "s/\(${1}=\).*/\1\"${VALUE}\"/" $F
 	    fi
             cat $F
         done
diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props
index 4a5d071..1e16c3d 100644
--- a/auth/sample/local/aaf.props
+++ b/auth/sample/local/aaf.props
@@ -20,3 +20,4 @@
 # Other
 aaf_data_dir=/opt/app/osaaf/data
 cadi_token_dir=/opt/app/osaaf/tokens
+cadi_loglevel=WARN