diff --git a/header.sh b/header.sh
index c7b1aca..0cc33bb 100644
--- a/header.sh
+++ b/header.sh
@@ -10,7 +10,7 @@ cat << EOF
 # Copyright 2014, Xenese Labs/Sicron-Perion XNF
 #==========================================================
 
-if [ -z "$HOME" ]; then HOME=/home/$(whoami); fi
+if [ -z "$HOME" ]; then HOME=/home/"\$(whoami)"; fi
 
 PROD_STR="$PROD_STR"
 VER_STR="$VER_STR"
diff --git a/sns.sh b/sns.sh
index 96a7e69..3cfb2cb 100755
--- a/sns.sh
+++ b/sns.sh
@@ -4,7 +4,7 @@
 # Copyright 2014, Xenese Labs/Sicron-Perion XNF
 #==========================================================
 
-if [ -z "/Users/xilmwa" ]; then HOME=/home/xilmwa; fi
+if [ -z "/Users/xilmwa" ]; then HOME=/home/"$(whoami)"; fi
 
 PROD_STR="Simple Note System"
 VER_STR="v2.0a5"