diff --git a/install/checkmk-install.sh b/install/checkmk-install.sh
index 6cc9c84082..b408ca64d2 100644
--- a/install/checkmk-install.sh
+++ b/install/checkmk-install.sh
@@ -24,13 +24,20 @@ motd_ssh
 customize
 
 msg_info "Creating Service"
-PASSWORD=$(omd create monitoring | grep "password:" | awk '{print $NF}')
-$STD omd start
+SITE_NAME="monitoring"
+$STD omd create "$SITE_NAME"
+MKPASSWORD=$(openssl rand -base64 18 | tr -d '/+=' | cut -c1-16)
+
+echo -e "$MKPASSWORD\n$MKPASSWORD" | su - "$SITE_NAME" -c "cmk-passwd cmkadmin --stdin"
+$STD omd start "$SITE_NAME"
+
 {
-    echo "Application-Credentials"
-    echo "Username: cmkadmin"
-    echo "Password: $PASSWORD"
+  echo "Application-Credentials"
+  echo "Username: cmkadmin"
+  echo "Password: $MKPASSWORD"
+  echo "Site: $SITE_NAME"
 } >>~/checkmk.creds
+
 msg_ok "Created Service"
 
 msg_info "Cleaning up"