diff --git a/src/freedombone-app-zap b/src/freedombone-app-zap
index 7984e3c640f45ff5e243dfcffd410cf315faaaf9..83b7e402f4aed602ff4f78b369caef1cae6a63f4 100755
--- a/src/freedombone-app-zap
+++ b/src/freedombone-app-zap
@@ -117,17 +117,21 @@ function reconfigure_zap {
     echo -n ''
 }
 
+function zap_set_permissions {
+    chown -R www-data:www-data "$ZAP_PATH/doc"
+    chown -R www-data:www-data "$ZAP_PATH/store"
+    chmod -R 755 "$ZAP_PATH/store"
+    chmod 1755 "$ZAP_PATH/store/[data]/smarty3"
+    chmod 1755 "$ZAP_PATH/view/tpl"
+    chmod 1755 "$ZAP_PATH/view/tpl/smarty3"
+    chmod 755 "$ZAP_PATH/.htconfig.php"
+}
+
 function upgrade_zap {
     ZAP_PATH=/var/www/$ZAP_DOMAIN_NAME/htdocs
     CURR_ZAP_COMMIT=$(get_completion_param "zap commit")
     if [[ "$CURR_ZAP_COMMIT" == "$ZAP_COMMIT" ]]; then
-        chown -R www-data:www-data "$ZAP_PATH/doc"
-        chown -R www-data:www-data "$ZAP_PATH/store"
-        chmod -R 755 "$ZAP_PATH/store"
-        chmod 1755 "$ZAP_PATH/store/[data]/smarty3"
-        chmod 1755 "$ZAP_PATH/view/tpl"
-        chmod 1755 "$ZAP_PATH/view/tpl/smarty3"
-        chmod 755 "$ZAP_PATH/.htconfig.php"
+        zap_set_permissions
         return
     fi
 
@@ -142,14 +146,7 @@ function upgrade_zap {
 
     chown -R www-data:www-data "$ZAP_PATH/extend"
     ./util/importdoc
-
-    chown -R www-data:www-data "$ZAP_PATH/doc"
-    chown -R www-data:www-data "$ZAP_PATH/store"
-    chmod -R 755 "$ZAP_PATH/store"
-    chmod 1755 "$ZAP_PATH/store/[data]/smarty3"
-    chmod 1755 "$ZAP_PATH/view/tpl"
-    chmod 1755 "$ZAP_PATH/view/tpl/smarty3"
-    chmod 755 "$ZAP_PATH/.htconfig.php"
+    zap_set_permissions
 }
 
 function backup_local_zap {