diff --git a/target/bin/addalias b/target/bin/addalias
index 7956cff6..a7776d69 100755
--- a/target/bin/addalias
+++ b/target/bin/addalias
@@ -24,7 +24,7 @@ grep -qi "^$(escape $EMAIL)[a-zA-Z@.\ ]*$(escape $RECIPIENT)" $DATABASE 2>/dev/n
 	errex "Alias \"$EMAIL $RECIPIENT\" already exists"
 
 if grep -qi "^$(escape $EMAIL)" $DATABASE 2>/dev/null; then
-        sed -i '' "/$EMAIL/s/$/ $RECIPIENT/" $DATABASE
+        sed -i '' "/$EMAIL/s/$/ $RECIPIENT,/" $DATABASE
     else
-        echo "$EMAIL $RECIPIENT" >> $DATABASE
+        echo "$EMAIL $RECIPIENT," >> $DATABASE
 fi
diff --git a/target/bin/delalias b/target/bin/delalias
index 947943aa..c79d2315 100755
--- a/target/bin/delalias
+++ b/target/bin/delalias
@@ -26,5 +26,5 @@ CNT=$(grep "^$EMAIL" $DATABASE | wc -w | awk '{print $1}')
 if [[ $CNT -eq 2 ]]; then
         sed -i '' "/^$EMAIL/d" $DATABASE
     else
-        sed -i '' "/^$EMAIL/s/ $RECIPIENT//g" $DATABASE
+        sed -i '' "/^$EMAIL/s/ $RECIPIENT,//g" $DATABASE
 fi