diff --git a/fleacollar.sh b/fleacollar.sh
index f4ae615..bff16ad 100755
--- a/fleacollar.sh
+++ b/fleacollar.sh
@@ -93,14 +93,14 @@ initialize_directory()
         cat << EOF > "$muttHome/scripts/add_address.sh"
 #!/bin/bash
 
-message="\$(cat)"
+message=\$(cat)
 
-newAlias=\$(echo "\${message}" | grep "^From: " | sed "s/[\,\"\']//g" | awk '{\$1=""; if (NF == 3) {print "alias" \$0;} else if (NF == 2) {print "alias" \$0 \$0;} else if (NF > 3) {print "alias", tolower(\$2)"-"tolower(\$(NF-1)) \$0;}}')
+newAlias=\$(echo "\${message}" | grep ^"From: " | sed -e s/[\,\"\']//g -e s/'From: '//g | awk -F" " '{if (NF == 1) {print "alias UNNAMED UNNAMED " \$0;} else if (NF == 2) {print "alias " \$1" " toupper(substr(\$0,1,1)) tolower(substr(\$0,2));} else if (NF >= 3) {print "alias ", tolower(\$1)"-"tolower(\$(NF-1))" " toupper(substr(\$0,1,1)) tolower(substr(\$0,2));}}')
 emailAddress="<\${newAlias##*<}"
 
-if ! grep -Fq "\$emailAddress" "$muttHome/aliases" ; then
-    echo "\$newAlias" >> "$muttHome/aliases"
-    sort -u "$muttHome/aliases" -o "$muttHome/aliases"
+if ! grep -Fq "\$emailAddress" \$HOME/.mutt/aliases; then
+    echo "\$newAlias" >> \$HOME/.mutt/aliases
+    sort -u ~/.mutt/aliases -o ~/.mutt/aliases
 fi
 
 echo "\${message}"