diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet
index 0e716c4c..77995fd2 100755
--- a/src/freedombone-app-zeronet
+++ b/src/freedombone-app-zeronet
@@ -63,10 +63,10 @@ function reconfigure_zeronet {
 
 function upgrade_zeronet {
     function_check set_repo_commit
-    set_repo_commit $MESH_INSTALL_DIR/zeronet "ZeroNet commit" "$ZERONET_COMMIT" $ZERONET_REPO
-    set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroBlog "ZeroNet Blog commit" "$ZERONET_BLOG_COMMIT" $ZERONET_BLOG_REPO
-    set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroMail "ZeroNet Mail commit" "$ZERONET_MAIL_COMMIT" $ZERONET_MAIL_REPO
-    set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroTalk "ZeroNet Forum commit" "$ZERONET_FORUM_COMMIT" $ZERONET_FORUM_REPO
+    set_repo_commit $MESH_INSTALL_DIR/zeronet "zeroNet commit" "$ZERONET_COMMIT" $ZERONET_REPO
+    set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroBlog "zeroNet blog commit" "$ZERONET_BLOG_COMMIT" $ZERONET_BLOG_REPO
+    set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroMail "zeroNet mail commit" "$ZERONET_MAIL_COMMIT" $ZERONET_MAIL_REPO
+    set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroTalk "zeroNet forum commit" "$ZERONET_FORUM_COMMIT" $ZERONET_FORUM_REPO
 }
 
 function backup_local_zeronet {
@@ -104,7 +104,7 @@ function remove_zeronet_mail {
         rm -rf $MESH_INSTALL_DIR/zeronet/ZeroMail
     fi
     sed -i '/install_zeronet_mail/d' $COMPLETION_FILE
-    sed -i '/ZeroNet Mail/d' $COMPLETION_FILE
+    sed -i '/zeroNet /d' $COMPLETION_FILE
 }
 
 function remove_zeronet_forum {
@@ -258,7 +258,6 @@ function install_zeronet_blog {
 
 function install_zeronet_mail {
     if [[ $(app_is_installed zeronet_mail) == "1" ]]; then
-    if grep -Fxq "install_zeronet_mail" $COMPLETION_FILE; then
         return
     fi