diff --git a/samba.sh b/samba.sh
index 5cbc1e3..8696cb2 100755
--- a/samba.sh
+++ b/samba.sh
@@ -88,9 +88,9 @@ recycle() { local file=/etc/samba/smb.conf
 #   writelist) list of users that can write to a RO share
 #   comment) description of share
 # Return: result
-share() { local share="$1" path="$2" browsable=${3:-yes} ro=${4:-yes} \
-                guest=${5:-yes} users=${6:-""} admins=${7:-""} \
-                writelist=${8:-""} comment=${9:-""} file=/etc/samba/smb.conf
+share() { local share="$1" path="$2" browsable="${3:-yes}" ro="${4:-yes}" \
+                guest="${5:-yes}" users="${6:-""}" admins="${7:-""}" \
+                writelist="${8:-""}" comment="${9:-""}" file=/etc/samba/smb.conf
     sed -i "/\\[$share\\]/,/^\$/d" $file
     echo "[$share]" >>$file
     echo "   path = $path" >>$file
@@ -211,7 +211,7 @@ while getopts ":hc:g:i:nprs:Su:Ww:" opt; do
         n) NMBD="true" ;;
         p) PERMISSIONS="true" ;;
         r) recycle ;;
-        s) eval share $(sed 's/^/"/; s/$/"/; s/;/" "/g' <<< $OPTARG) ;;
+        s) eval share $(sed 's/;/ /g' <<< $OPTARG) ;;
         S) smb ;;
         u) eval user $(sed 's/;/ /g' <<< $OPTARG) ;;
         w) workgroup "$OPTARG" ;;
@@ -227,7 +227,7 @@ shift $(( OPTIND - 1 ))
 [[ "${IMPORT:-""}" ]] && import "$IMPORT"
 [[ "${PERMISSIONS:-""}" ]] && perms
 [[ "${RECYCLE:-""}" ]] && recycle
-[[ "${SHARE:-""}" ]] && share $(sed 's/^/"/; s/$/"/; s/;/" "/g' <<< $SHARE)
+[[ "${SHARE:-""}" ]] && share $(sed 's/;/ /g' <<< $SHARE)
 [[ "${SMB:-""}" ]] && smb
 [[ "${USER:-""}" ]] && user $(sed 's/;/ /g' <<< $USER)
 [[ "${WORKGROUP:-""}" ]] && workgroup "$WORKGROUP"