diff --git a/run-document-server.sh b/run-document-server.sh
index 83aeb00..f0fbd87 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+umask 0022
+
 function clean_exit {
   /usr/bin/documentserver-prepare4shutdown.sh
 }
@@ -593,6 +595,8 @@ else
   update_welcome_page
 fi
 
+find /etc/${COMPANY_NAME} -exec chown ds:ds {} \;
+
 #start needed local services
 for i in ${LOCAL_SERVICES[@]}; do
   service $i start