diff --git a/src/freedombone-image b/src/freedombone-image
index 7e02335f..3c9bb862 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -64,7 +64,7 @@ GENERIC_IMAGE_PASSWORD='freedombone'
 
 IMAGE_TYPE='beaglebone'
 CURR_DIR=$(pwd)
-CURR_USER=$(echo $USER)
+CURR_USER="$USER"
 TEMPBUILD_DIR=~/.tmp_${PROJECT_NAME}_build
 VMDEBOOTSTRAP_REPO=git://git.liw.fi/vmdebootstrap
 VMDEBOOTSTRAP_VERSION=0.8
@@ -73,7 +73,7 @@ IMAGE_SIZE=7.9G
 IMAGE_SIZE_SPECIFIED=
 IMAGE_NAME='full'
 
-USERNAME=$(echo $USER)
+USERNAME="$USER"
 PASSWORD=
 
 # IP address of the router (gateway)