diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index efe204f58ed8651ecc3d4854a9a41815a7e6b1ee..cd1f5f9269dd5d8cf72c6a418685080fe2601591 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -229,9 +229,10 @@ do
     if [[ $(function_exists "add_user_${app_name}") == "1" ]]; then
         echo $"Adding user to ${app_name}"
         app_load_variables "${app_name}"
-        retval=$("add_user_${app_name}" "$ADD_USERNAME" "$NEW_USER_PASSWORD" | tail -n 1)
-        if [[ $retval != '0' ]]; then
-            echo $"Failed with error code ${retval}"
+        retval=$("add_user_${app_name}" "$ADD_USERNAME" "$NEW_USER_PASSWORD")
+        retval_last_value=$(echo "$retval" | tail -n 1)
+        if [[ $retval_last_value != '0' ]]; then
+            echo $"Failed with error code ${retval_last_value}"
             "${PROJECT_NAME}-rmuser" "$ADD_USERNAME" --force
             exit 672392
         fi
diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile
index 13d1b757754dec1dd84e99b30b606fd8a22b839c..22a57f4d24ba04b3a9671cc8e37c2a29d38ee067 100755
--- a/src/freedombone-app-mailpile
+++ b/src/freedombone-app-mailpile
@@ -61,10 +61,12 @@ function logging_off_mailpile {
 function remove_user_mailpile {
     remove_username="$1"
     "${PROJECT_NAME}-pass" -u "$remove_username" --rmapp mailpile
+    echo "0"
 }
 
 function add_user_mailpile {
     "${PROJECT_NAME}-pass" -u "$1" -a mailpile -p "$2"
+    echo "0"
 }
 
 function install_interactive_mailpile {