diff --git a/src/freedombone-addcert b/src/freedombone-addcert
index bb15f15e..a2a43946 100755
--- a/src/freedombone-addcert
+++ b/src/freedombone-addcert
@@ -180,9 +180,7 @@ function add_cert_letsencrypt {
     # obtain the email address for the admin user
     if [ ! $MY_EMAIL_ADDRESS ]; then
         if [ -f $CONFIGURATION_FILE ]; then
-            if grep -q "MY_EMAIL_ADDRESS=" $CONFIGURATION_FILE; then
-                MY_EMAIL_ADDRESS=$(cat $CONFIGURATION_FILE | grep "MY_EMAIL_ADDRESS=" | awk -F '=' '{print $2}')
-            fi
+            read_config_param MY_EMAIL_ADDRESS
         fi
     fi
     if [ ! $MY_EMAIL_ADDRESS ]; then
diff --git a/src/freedombone-encrypt-mail b/src/freedombone-encrypt-mail
index 63486ffd..8e7d6cf1 100755
--- a/src/freedombone-encrypt-mail
+++ b/src/freedombone-encrypt-mail
@@ -30,6 +30,9 @@
 
 USERNAME=$1
 
+PROJECT_NAME='freedombone'
+COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
+
 ADMIN_USER=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
 
 if [ ! $USERNAME ]; then